summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBogdan Devichev <b.devichev@samsung.com>2014-11-14 15:50:26 +0200
committerBogdan Devichev <b.devichev@samsung.com>2014-11-14 15:50:26 +0200
commitb00eb38e4141713529bcd81c7c70a264828b4a59 (patch)
tree53adaeef2e459648245931d42226f7c764ed6bc2
parent7d682be0cf1a69b5fb55381e5cd3742b860f6efe (diff)
[Blender_plugins] Project is restructured, fixed links in autogen and main python script, renamed scenes.
-rw-r--r--Examples/emblem_scene.blend (renamed from Examples/Blender_EFL_embl.blend)bin875196 -> 875196 bytes
-rw-r--r--Examples/messy_scene.blend (renamed from Examples/blend_scene_for_testing2.blend)bin856792 -> 860400 bytes
-rwxr-xr-xautogen.sh25
-rw-r--r--src/Blender_to_edc.py (renamed from To_Blender_scripts/Blender_to_edc.py)11
-rw-r--r--src/lib/edc_geom.py (renamed from To_Blender_scripts/edc_geom.py)0
-rw-r--r--src/resources/green_NULL.png (renamed from To_Blender_scripts/green_NULL.png)bin144 -> 144 bytes
6 files changed, 24 insertions, 12 deletions
diff --git a/Examples/Blender_EFL_embl.blend b/Examples/emblem_scene.blend
index 8a4a72c..f443c31 100644
--- a/Examples/Blender_EFL_embl.blend
+++ b/Examples/emblem_scene.blend
Binary files differ
diff --git a/Examples/blend_scene_for_testing2.blend b/Examples/messy_scene.blend
index 108a864..ae1d84e 100644
--- a/Examples/blend_scene_for_testing2.blend
+++ b/Examples/messy_scene.blend
Binary files differ
diff --git a/autogen.sh b/autogen.sh
index af630f1..6cac8bb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,22 @@
1#!/bin/bash
2function copy {
3 mkdir -p $2;
4 for filename in `cd $1 && ls -A`; do
5 if [ -d $1/"$filename" ]; then
6 copy $1/$filename $2/$filename
7 else
8 cat $1/$filename > $2/$filename
9 echo File $filename copied from $1/ to $2/.
10 fi
11 done
12}
13
1BLENDER_SCRIPTS_PATH="not checked" 14BLENDER_SCRIPTS_PATH="not checked"
2version="unknown" 15version="unknown"
3 16
4version=`blender -v | head -n 2 | tail -n 1 | grep -o "[0-9]*\.[0-9]*"` 17version=`blender -v | head -n 2 | tail -n 1 | grep -o "[0-9]*\.[0-9]*"`
5 18
6echo "Replacing of plugins..." 19echo "Copying of files..."
7 20
8case "$OSTYPE" in 21case "$OSTYPE" in
9 solaris*) BLENDER_SCRIPTS_PATH=$HOME/.config/blender/$version/scripts/addons ;; 22 solaris*) BLENDER_SCRIPTS_PATH=$HOME/.config/blender/$version/scripts/addons ;;
@@ -14,10 +27,8 @@ case "$OSTYPE" in
14 *) BLENDER_SCRIPTS_PATH="unknown: $OSTYPE" ;; 27 *) BLENDER_SCRIPTS_PATH="unknown: $OSTYPE" ;;
15esac 28esac
16 29
17mkdir -p $BLENDER_SCRIPTS_PATH; 30echo " "
18 31copy src $BLENDER_SCRIPTS_PATH
19for filename in `cd To_Blender_scripts && ls -A`; do 32echo " "
20 cat To_Blender_scripts/$filename > $BLENDER_SCRIPTS_PATH/$filename
21done
22 33
23echo "Plugins installed" 34echo "Plugin installed"
diff --git a/To_Blender_scripts/Blender_to_edc.py b/src/Blender_to_edc.py
index 0c57065..81ca417 100644
--- a/To_Blender_scripts/Blender_to_edc.py
+++ b/src/Blender_to_edc.py
@@ -4,11 +4,12 @@ bl_info = {
4 "location": "File > Import/Export > EFL (.edc)" 4 "location": "File > Import/Export > EFL (.edc)"
5} 5}
6 6
7import os 7import os, sys, math, bpy, shutil
8import math 8
9import bpy 9lib_path = bpy.path.abspath('.config/blender/2.69/scripts/addons/lib/')
10import shutil 10sys.path.append(lib_path)
11import edc_geom 11import edc_geom
12
12from bpy_extras.io_utils import ExportHelper 13from bpy_extras.io_utils import ExportHelper
13 14
14PLY_FOLDER = "ply_files" 15PLY_FOLDER = "ply_files"
@@ -16,7 +17,7 @@ IMAGE_FOLDER = "image_files"
16PROJECT_FOLDER = "project" 17PROJECT_FOLDER = "project"
17 18
18#FIXME waiting of fixing problem with NULL proxy of texture on edje creator 19#FIXME waiting of fixing problem with NULL proxy of texture on edje creator
19NULL_TEX = bpy.path.abspath(".config/blender/2.69/scripts/addons/green_NULL.png") 20NULL_TEX = bpy.path.abspath(".config/blender/2.69/scripts/addons/resources/green_NULL.png")
20 21
21MESH_PARAMETERS = edc_geom.Mesh_Parameters() 22MESH_PARAMETERS = edc_geom.Mesh_Parameters()
22INIT_MESH_PARAMETERS = edc_geom.Mesh_Parameters() 23INIT_MESH_PARAMETERS = edc_geom.Mesh_Parameters()
diff --git a/To_Blender_scripts/edc_geom.py b/src/lib/edc_geom.py
index e2bde0c..e2bde0c 100644
--- a/To_Blender_scripts/edc_geom.py
+++ b/src/lib/edc_geom.py
diff --git a/To_Blender_scripts/green_NULL.png b/src/resources/green_NULL.png
index 061cab7..061cab7 100644
--- a/To_Blender_scripts/green_NULL.png
+++ b/src/resources/green_NULL.png
Binary files differ