[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23477] branches/ge_dyn_load: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22959 :22999
Revision: 23477 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23477 Author: campbellbarton Date: 2009-09-25 07:30:07 +0200 (Fri, 25 Sep 2009) Log Message: --- svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22959:22999 Modified Paths: -- branches/ge_dyn_load/CMakeLists.txt branches/ge_dyn_load/SConstruct branches/ge_dyn_load/extern/ffmpeg/SConscript branches/ge_dyn_load/extern/libmp3lame/SConscript branches/ge_dyn_load/extern/libredcode/SConscript branches/ge_dyn_load/extern/x264/SConscript branches/ge_dyn_load/extern/xvidcore/SConscript branches/ge_dyn_load/intern/guardedalloc/SConscript branches/ge_dyn_load/intern/memutil/SConscript branches/ge_dyn_load/release/ui/bpy_ops.py branches/ge_dyn_load/release/ui/buttons_data_bone.py branches/ge_dyn_load/release/ui/buttons_data_modifier.py branches/ge_dyn_load/release/ui/space_console.py branches/ge_dyn_load/release/ui/space_view3d.py branches/ge_dyn_load/source/SConscript branches/ge_dyn_load/source/blender/blenkernel/intern/anim_sys.c branches/ge_dyn_load/source/blender/blenlib/BLI_voxel.h branches/ge_dyn_load/source/blender/blenlib/intern/storage.c branches/ge_dyn_load/source/blender/blenlib/intern/util.c branches/ge_dyn_load/source/blender/blenlib/intern/voxel.c branches/ge_dyn_load/source/blender/blenloader/SConscript branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c branches/ge_dyn_load/source/blender/blenpluginapi/SConscript branches/ge_dyn_load/source/blender/editors/animation/anim_channels_defines.c branches/ge_dyn_load/source/blender/editors/animation/anim_intern.h branches/ge_dyn_load/source/blender/editors/animation/anim_ops.c branches/ge_dyn_load/source/blender/editors/animation/drivers.c branches/ge_dyn_load/source/blender/editors/animation/keyframes_draw.c branches/ge_dyn_load/source/blender/editors/animation/keyframes_edit.c branches/ge_dyn_load/source/blender/editors/animation/keyframes_general.c branches/ge_dyn_load/source/blender/editors/animation/keyframing.c branches/ge_dyn_load/source/blender/editors/animation/keyingsets.c branches/ge_dyn_load/source/blender/editors/armature/editarmature.c branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_buttons.c branches/ge_dyn_load/source/blender/editors/include/ED_anim_api.h branches/ge_dyn_load/source/blender/editors/include/ED_keyframes_draw.h branches/ge_dyn_load/source/blender/editors/include/ED_keyframes_edit.h branches/ge_dyn_load/source/blender/editors/include/ED_keyframing.h branches/ge_dyn_load/source/blender/editors/interface/interface_anim.c branches/ge_dyn_load/source/blender/editors/interface/interface_handlers.c branches/ge_dyn_load/source/blender/editors/interface/interface_intern.h branches/ge_dyn_load/source/blender/editors/object/editconstraint.c branches/ge_dyn_load/source/blender/editors/object/object_edit.c branches/ge_dyn_load/source/blender/editors/object/object_intern.h branches/ge_dyn_load/source/blender/editors/object/object_modifier.c branches/ge_dyn_load/source/blender/editors/object/object_ops.c branches/ge_dyn_load/source/blender/editors/physics/ed_pointcache.c branches/ge_dyn_load/source/blender/editors/screen/area.c branches/ge_dyn_load/source/blender/editors/screen/screen_ops.c branches/ge_dyn_load/source/blender/editors/space_action/action_edit.c branches/ge_dyn_load/source/blender/editors/space_action/action_header.c branches/ge_dyn_load/source/blender/editors/space_action/action_intern.h branches/ge_dyn_load/source/blender/editors/space_action/action_ops.c branches/ge_dyn_load/source/blender/editors/space_buttons/buttons_ops.c branches/ge_dyn_load/source/blender/editors/space_console/console_ops.c branches/ge_dyn_load/source/blender/editors/space_console/console_report.c branches/ge_dyn_load/source/blender/editors/space_console/space_console.c branches/ge_dyn_load/source/blender/editors/space_file/file_intern.h branches/ge_dyn_load/source/blender/editors/space_file/file_ops.c branches/ge_dyn_load/source/blender/editors/space_file/space_file.c branches/ge_dyn_load/source/blender/editors/space_graph/graph_edit.c branches/ge_dyn_load/source/blender/editors/space_graph/graph_header.c branches/ge_dyn_load/source/blender/editors/space_nla/nla_buttons.c branches/ge_dyn_load/source/blender/editors/space_nla/nla_draw.c branches/ge_dyn_load/source/blender/editors/space_outliner/outliner.c branches/ge_dyn_load/source/blender/editors/space_text/text_ops.c branches/ge_dyn_load/source/blender/editors/transform/transform_conversions.c branches/ge_dyn_load/source/blender/gpu/SConscript branches/ge_dyn_load/source/blender/imbuf/intern/cineon/SConscript branches/ge_dyn_load/source/
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23476] trunk/blender/release/io: - use pythons time module rather then bpy.sys.time()
Revision: 23476
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23476
Author: campbellbarton
Date: 2009-09-25 07:25:44 +0200 (Fri, 25 Sep 2009)
Log Message:
---
- use pythons time module rather then bpy.sys.time()
- comment poll functions, maybe could check for editable scene later
- importing OBJs imports triangle meshes.
Modified Paths:
--
trunk/blender/release/io/import_3ds.py
trunk/blender/release/io/import_obj.py
Modified: trunk/blender/release/io/import_3ds.py
===
--- trunk/blender/release/io/import_3ds.py 2009-09-25 04:51:04 UTC (rev
23475)
+++ trunk/blender/release/io/import_3ds.py 2009-09-25 05:25:44 UTC (rev
23476)
@@ -1154,10 +1154,10 @@
wm = context.manager
wm.add_fileselect(self.__operator__)
return ('RUNNING_MODAL',)
-
- def poll(self, context): # Poll isnt working yet
+ '''
+ def poll(self, context):
print("Poll")
- return context.active_object != None
+ return context.active_object != None'''
bpy.ops.add(IMPORT_OT_3ds)
Modified: trunk/blender/release/io/import_obj.py
===
--- trunk/blender/release/io/import_obj.py 2009-09-25 04:51:04 UTC (rev
23475)
+++ trunk/blender/release/io/import_obj.py 2009-09-25 05:25:44 UTC (rev
23476)
@@ -41,7 +41,7 @@
# --
import os
-
+import time
import bpy
import Mathutils
import Geometry
@@ -993,7 +993,7 @@
if SPLIT_OBJECTS or SPLIT_GROUPS or SPLIT_MATERIALS:
POLYGROUPS = False
- time_main= bpy.sys.time()
+ time_main= time.time()
# time_main= sys.time()
verts_loc= []
@@ -1032,7 +1032,7 @@
context_multi_line= ''
print('\tparsing obj file "%s"...' % filepath)
- time_sub= bpy.sys.time()
+ time_sub= time.time()
# time_sub= sys.time()
file= open(filepath, 'rU')
@@ -1241,7 +1241,7 @@
'''
file.close()
- time_new= bpy.sys.time()
+ time_new= time.time()
# time_new= sys.time()
print('%.4f sec' % (time_new-time_sub))
time_sub= time_new
@@ -1250,7 +1250,7 @@
print('\tloading materials and images...')
create_materials(filepath, material_libs, unique_materials,
unique_material_images, IMAGE_SEARCH)
- time_new= bpy.sys.time()
+ time_new= time.time()
# time_new= sys.time()
print('%.4f sec' % (time_new-time_sub))
time_sub= time_new
@@ -1307,7 +1307,7 @@
# for ob in new_objects:
# ob.RotX = -1.570796326794896558
- time_new= bpy.sys.time()
+ time_new= time.time()
# time_new= sys.time()
print('%.4f sec' % (time_new-time_sub))
@@ -1585,9 +1585,9 @@
bpy.props.BoolProperty(attr="IMAGE_SEARCH", name="Image
Search", description="Search subdirs for any assosiated images (Warning, may be
slow)", default= True),
]
+ '''
def poll(self, context):
- print("Poll")
- return context.active_object != None
+ return True '''
def execute(self, context):
# print("Selected: " + context.active_object.name)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
Re: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23475] trunk/blender/source/blender: Drivers: Copy/Paste tools for the RMB Menu
Forgot to note in the commit log that this commit also fixes
bug #19442 - Blender crash when rename constrained objects targets
On Fri, Sep 25, 2009 at 4:51 PM, Joshua Leung wrote:
>
> Revision: 23475
>
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23475
> Author: aligorith
> Date: 2009-09-25 06:51:04 +0200 (Fri, 25 Sep 2009)
>
> Log Message:
> ---
> Drivers: Copy/Paste tools for the RMB Menu
>
> Drivers can now be copied/pasted for single properties, allowing drivers set
> up on one property to be added to a few other properties relatively easily.
>
> Also, added description strings for the other driver-button operators.
>
> Modified Paths:
> --
> trunk/blender/source/blender/blenkernel/intern/constraint.c
> trunk/blender/source/blender/editors/animation/anim_ops.c
> trunk/blender/source/blender/editors/animation/drivers.c
> trunk/blender/source/blender/editors/include/ED_keyframing.h
> trunk/blender/source/blender/editors/interface/interface_anim.c
> trunk/blender/source/blender/editors/interface/interface_intern.h
> trunk/blender/source/blender/editors/interface/interface_layout.c
> trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
>
> Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
> ===
> --- trunk/blender/source/blender/blenkernel/intern/constraint.c 2009-09-25
> 04:25:40 UTC (rev 23474)
> +++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2009-09-25
> 04:51:04 UTC (rev 23475)
> @@ -688,7 +688,7 @@
> if ((ct->tar->type==OB_ARMATURE) &&
> (ct->subtarget[0])) { \
> bPoseChannel *pchan=
> get_pose_channel(ct->tar->pose, ct->subtarget); \
> ct->type = CONSTRAINT_OBTYPE_BONE; \
> - ct->rotOrder= pchan->rotmode; \
> + ct->rotOrder= (pchan) ? (pchan->rotmode) :
> EULER_ORDER_DEFAULT; \
> }\
> else if (ELEM(ct->tar->type, OB_MESH, OB_LATTICE) &&
> (ct->subtarget[0])) { \
> ct->type = CONSTRAINT_OBTYPE_VERT; \
>
> Modified: trunk/blender/source/blender/editors/animation/anim_ops.c
> ===
> --- trunk/blender/source/blender/editors/animation/anim_ops.c 2009-09-25
> 04:25:40 UTC (rev 23474)
> +++ trunk/blender/source/blender/editors/animation/anim_ops.c 2009-09-25
> 04:51:04 UTC (rev 23475)
> @@ -399,6 +399,8 @@
>
> WM_operatortype_append(ANIM_OT_add_driver_button);
> WM_operatortype_append(ANIM_OT_remove_driver_button);
> + WM_operatortype_append(ANIM_OT_copy_driver_button);
> + WM_operatortype_append(ANIM_OT_paste_driver_button);
>
> WM_operatortype_append(ANIM_OT_add_keyingset_button);
> WM_operatortype_append(ANIM_OT_remove_keyingset_button);
>
> Modified: trunk/blender/source/blender/editors/animation/drivers.c
> ===
> --- trunk/blender/source/blender/editors/animation/drivers.c 2009-09-25
> 04:25:40 UTC (rev 23474)
> +++ trunk/blender/source/blender/editors/animation/drivers.c 2009-09-25
> 04:51:04 UTC (rev 23475)
> @@ -80,6 +80,10 @@
>
> /* Get (or add relevant data to be able to do so) F-Curve from the driver
> stack,
> * for the given Animation Data block. This assumes that all the destinations
> are valid.
> + *
> + * - add: 0 - don't add anything if not found,
> + * 1 - add new Driver FCurve,
> + * -1 - add new Driver FCurve without driver stuff (for
> pasting)
> */
> FCurve *verify_driver_fcurve (ID *id, const char rna_path[], const int
> array_index, short add)
> {
> @@ -115,12 +119,15 @@
> fcu->rna_path= BLI_strdupn(rna_path, strlen(rna_path));
> fcu->array_index= array_index;
>
> - /* add some new driver data */
> - fcu->driver= MEM_callocN(sizeof(ChannelDriver),
> "ChannelDriver");
> + /* if add is negative, don't init this data yet, since it
> will be filled in by the pasted driver */
> + if (add > 0) {
> + /* add some new driver data */
> + fcu->driver= MEM_callocN(sizeof(ChannelDriver),
> "ChannelDriver");
> +
> + /* add simple generator modifier for driver so that
> there is some visible representation */
> + add_fmodifier(&fcu->modifiers,
> FMODIFIER_TYPE_GENERATOR);
> + }
>
> - /* add simple generator modifier for driver so that there is
> some visible representation */
> - add_fmodifier(&fcu->modifiers, FMODIFIER_TYPE_GENERATOR);
> -
> /* just add F-Curve to end of driver list */
>
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23475] trunk/blender/source/blender: Drivers: Copy/Paste tools for the RMB Menu
Revision: 23475
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23475
Author: aligorith
Date: 2009-09-25 06:51:04 +0200 (Fri, 25 Sep 2009)
Log Message:
---
Drivers: Copy/Paste tools for the RMB Menu
Drivers can now be copied/pasted for single properties, allowing drivers set up
on one property to be added to a few other properties relatively easily.
Also, added description strings for the other driver-button operators.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/editors/animation/anim_ops.c
trunk/blender/source/blender/editors/animation/drivers.c
trunk/blender/source/blender/editors/include/ED_keyframing.h
trunk/blender/source/blender/editors/interface/interface_anim.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2009-09-25
04:25:40 UTC (rev 23474)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2009-09-25
04:51:04 UTC (rev 23475)
@@ -688,7 +688,7 @@
if ((ct->tar->type==OB_ARMATURE) && (ct->subtarget[0]))
{ \
bPoseChannel *pchan=
get_pose_channel(ct->tar->pose, ct->subtarget); \
ct->type = CONSTRAINT_OBTYPE_BONE; \
- ct->rotOrder= pchan->rotmode; \
+ ct->rotOrder= (pchan) ? (pchan->rotmode) :
EULER_ORDER_DEFAULT; \
}\
else if (ELEM(ct->tar->type, OB_MESH, OB_LATTICE) &&
(ct->subtarget[0])) { \
ct->type = CONSTRAINT_OBTYPE_VERT; \
Modified: trunk/blender/source/blender/editors/animation/anim_ops.c
===
--- trunk/blender/source/blender/editors/animation/anim_ops.c 2009-09-25
04:25:40 UTC (rev 23474)
+++ trunk/blender/source/blender/editors/animation/anim_ops.c 2009-09-25
04:51:04 UTC (rev 23475)
@@ -399,6 +399,8 @@
WM_operatortype_append(ANIM_OT_add_driver_button);
WM_operatortype_append(ANIM_OT_remove_driver_button);
+ WM_operatortype_append(ANIM_OT_copy_driver_button);
+ WM_operatortype_append(ANIM_OT_paste_driver_button);
WM_operatortype_append(ANIM_OT_add_keyingset_button);
WM_operatortype_append(ANIM_OT_remove_keyingset_button);
Modified: trunk/blender/source/blender/editors/animation/drivers.c
===
--- trunk/blender/source/blender/editors/animation/drivers.c2009-09-25
04:25:40 UTC (rev 23474)
+++ trunk/blender/source/blender/editors/animation/drivers.c2009-09-25
04:51:04 UTC (rev 23475)
@@ -80,6 +80,10 @@
/* Get (or add relevant data to be able to do so) F-Curve from the driver
stack,
* for the given Animation Data block. This assumes that all the destinations
are valid.
+ *
+ * - add: 0 - don't add anything if not found,
+ * 1 - add new Driver FCurve,
+ * -1 - add new Driver FCurve without driver stuff (for
pasting)
*/
FCurve *verify_driver_fcurve (ID *id, const char rna_path[], const int
array_index, short add)
{
@@ -115,12 +119,15 @@
fcu->rna_path= BLI_strdupn(rna_path, strlen(rna_path));
fcu->array_index= array_index;
- /* add some new driver data */
- fcu->driver= MEM_callocN(sizeof(ChannelDriver),
"ChannelDriver");
+ /* if add is negative, don't init this data yet, since it will
be filled in by the pasted driver */
+ if (add > 0) {
+ /* add some new driver data */
+ fcu->driver= MEM_callocN(sizeof(ChannelDriver),
"ChannelDriver");
+
+ /* add simple generator modifier for driver so that
there is some visible representation */
+ add_fmodifier(&fcu->modifiers,
FMODIFIER_TYPE_GENERATOR);
+ }
- /* add simple generator modifier for driver so that there is
some visible representation */
- add_fmodifier(&fcu->modifiers, FMODIFIER_TYPE_GENERATOR);
-
/* just add F-Curve to end of driver list */
BLI_addtail(&adt->drivers, fcu);
}
@@ -144,7 +151,7 @@
/* validate pointer first - exit if failure */
RNA_id_pointer_create(id, &id_ptr);
if ((RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop) == 0) || (prop ==
NULL)) {
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23474] trunk/blender: still doesn' t work but this fixes make clean
Revision: 23474 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23474 Author: campbellbarton Date: 2009-09-25 06:25:40 +0200 (Fri, 25 Sep 2009) Log Message: --- still doesn't work but this fixes make clean Modified Paths: -- trunk/blender/intern/Makefile trunk/blender/source/nan_definitions.mk Modified: trunk/blender/intern/Makefile === --- trunk/blender/intern/Makefile 2009-09-25 02:40:10 UTC (rev 23473) +++ trunk/blender/intern/Makefile 2009-09-25 04:25:40 UTC (rev 23474) @@ -32,7 +32,7 @@ # include nan_subdirs.mk ALLDIRS = string ghost guardedalloc moto container memutil -ALLDIRS += decimation iksolver itasc bsp SoundSystem opennl elbeem boolop smoke audaspace +ALLDIRS += decimation iksolver itasc bsp opennl elbeem boolop smoke audaspace all:: @for i in $(ALLDIRS); do \ Modified: trunk/blender/source/nan_definitions.mk === --- trunk/blender/source/nan_definitions.mk 2009-09-25 02:40:10 UTC (rev 23473) +++ trunk/blender/source/nan_definitions.mk 2009-09-25 04:25:40 UTC (rev 23474) @@ -81,6 +81,8 @@ endif export NAN_MOTO ?= $(LCGDIR)/moto + export NAN_ITASC ?= $(LCGDIR)/itasc + export BF_PROFILE ?= false export NAN_USE_BULLET ?= true export NAN_BULLET2 ?= $(LCGDIR)/bullet2 ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23473] trunk/blender: options WITH_LZO and WITH_LZMA for cmake and scons (default to true) pointcache.c also needed to have checks for these defines.
Revision: 23473
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23473
Author: campbellbarton
Date: 2009-09-25 04:40:10 +0200 (Fri, 25 Sep 2009)
Log Message:
---
options WITH_LZO and WITH_LZMA for cmake and scons (default to true)
pointcache.c also needed to have checks for these defines.
Modified Paths:
--
trunk/blender/CMakeLists.txt
trunk/blender/extern/CMakeLists.txt
trunk/blender/extern/Makefile
trunk/blender/extern/SConscript
trunk/blender/source/blender/SConscript
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenkernel/intern/Makefile
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/tools/btools.py
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2009-09-25 01:59:43 UTC (rev 23472)
+++ trunk/blender/CMakeLists.txt2009-09-25 02:40:10 UTC (rev 23473)
@@ -75,6 +75,8 @@
OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
OPTION(WITH_SNDFILE "Enable libsndfile Support
(http://www.mega-nerd.com/libsndfile)" OFF)
+OPTION(WITH_LZO "Enable fast LZO compression, used for pointcache"
ON)
+OPTION(WITH_LZMA "Enable best LZMA compression, used for pointcache"
ON)
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation"
OFF)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_INSTALL "Install accompanying scripts and language files
needed to run blender" ON)
Modified: trunk/blender/extern/CMakeLists.txt
===
--- trunk/blender/extern/CMakeLists.txt 2009-09-25 01:59:43 UTC (rev 23472)
+++ trunk/blender/extern/CMakeLists.txt 2009-09-25 02:40:10 UTC (rev 23473)
@@ -38,5 +38,10 @@
ADD_SUBDIRECTORY(libopenjpeg)
ENDIF(WITH_OPENJPEG)
-ADD_SUBDIRECTORY(lzo)
-ADD_SUBDIRECTORY(lzma)
+IF(WITH_LZO)
+ ADD_SUBDIRECTORY(lzo)
+ENDIF(WITH_LZO)
+
+IF(WITH_LZMA)
+ ADD_SUBDIRECTORY(lzma)
+ENDIF(WITH_LZMA)
Modified: trunk/blender/extern/Makefile
===
--- trunk/blender/extern/Makefile 2009-09-25 01:59:43 UTC (rev 23472)
+++ trunk/blender/extern/Makefile 2009-09-25 02:40:10 UTC (rev 23473)
@@ -33,9 +33,9 @@
DIRS = glew/src
# Cloth requires it
-#ifneq ($(NAN_NO_KETSJI), true)
-DIRS += bullet2
-#endif
+ifeq ($(NAN_USE_BULLET), true)
+ DIRS += bullet2
+endif
ifeq ($(WITH_BINRELOC), true)
DIRS += binreloc
Modified: trunk/blender/extern/SConscript
===
--- trunk/blender/extern/SConscript 2009-09-25 01:59:43 UTC (rev 23472)
+++ trunk/blender/extern/SConscript 2009-09-25 02:40:10 UTC (rev 23473)
@@ -22,5 +22,8 @@
if env['OURPLATFORM'] == 'linux2':
SConscript(['binreloc/SConscript']);
-SConscript(['lzo/SConscript'])
-SConscript(['lzma/SConscript'])
+if env['WITH_BF_LZO']:
+ SConscript(['lzo/SConscript'])
+
+if env['WITH_BF_LZMA']:
+ SConscript(['lzma/SConscript'])
Modified: trunk/blender/source/blender/SConscript
===
--- trunk/blender/source/blender/SConscript 2009-09-25 01:59:43 UTC (rev
23472)
+++ trunk/blender/source/blender/SConscript 2009-09-25 02:40:10 UTC (rev
23473)
@@ -18,7 +18,7 @@
'nodes/SConscript',
'ikplugin/SConscript',
'windowmanager/SConscript',
- 'blenfont/SConscript'])
+'blenfont/SConscript'])
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2009-09-25
01:59:43 UTC (rev 23472)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2009-09-25
02:40:10 UTC (rev 23473)
@@ -34,8 +34,6 @@
../nodes ../../../extern/glew/include ../gpu ../makesrna
../../../intern/smoke/extern
../../../intern/bsp/extern ../blenfont
../../../intern/audaspace/intern
- ../../../extern/lzo/minilzo
- ../../../extern/lzma
${ZLIB_INC}
)
@@ -76,6 +74,16 @@
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
ENDIF(NOT WITH_ELBEEM)
+IF(WITH_LZO)
+ SET(INC ${INC} ../../../extern/lzo/minilzo)
+ ADD_DEFINITIONS(-DWITH_LZO)
+ENDIF(WITH_LZO)
+
+IF(WITH_LZMA)
+ SET(INC ${INC} ../../../extern/lzma)
+ ADD_DEFINITIONS(-DWITH_LZMA)
+ENDIF(WITH_LZMA)
+
IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC})
ENDIF(WIN32)
Modified: trunk/blender/source/blender/blenkernel/SConscript
===
--- tr
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23472] trunk/blender: Shell script exit values should be non-negative.
Revision: 23472 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23472 Author: gsrb3d Date: 2009-09-25 03:59:43 +0200 (Fri, 25 Sep 2009) Log Message: --- Shell script exit values should be non-negative. Exact error with dash as sh "exit: 12: Illegal number: -1". The rest are just changes to whitespace and polishing. Modified Paths: -- trunk/blender/extern/Eigen2/eigen-update.sh trunk/blender/source/blender/blenfont/Makefile trunk/blender/source/blender/blenlib/intern/BLI_bfile.c Modified: trunk/blender/extern/Eigen2/eigen-update.sh === --- trunk/blender/extern/Eigen2/eigen-update.sh 2009-09-25 01:49:06 UTC (rev 23471) +++ trunk/blender/extern/Eigen2/eigen-update.sh 2009-09-25 01:59:43 UTC (rev 23472) @@ -1,28 +1,28 @@ #!/bin/sh -echo "*** EIGEN2-SVN Update utility" -echo "*** This gets a new eigen2-svn tree and adapts it to blenders build structure" +echo "*** EIGEN2-HG Update utility" +echo "*** This gets a new eigen2-hg tree and adapts it to blenders build structure" echo "*** Warning! This script will wipe all the header file" -echo "*** Please run again with --i-really-know-what-im-doing ..." if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then - echo proceeding... +echo Proceeding as requested by command line ... else - exit -1 +echo "*** Please run again with --i-really-know-what-im-doing ..." +exit 1 fi # get the latest revision from repository. hg clone http://bitbucket.org/eigen/eigen2 if [ -d eigen2 ] then - cd eigen2 - # put here the version you want to use - hg up 2.0.6 - rm -f `find Eigen/ -type f -name "CMakeLists.txt"` - cp -r Eigen .. - cd .. - rm -rf eigen2 +cd eigen2 +# put here the version you want to use +hg up 2.0.6 +rm -f `find Eigen/ -type f -name "CMakeLists.txt"` +cp -r Eigen .. +cd .. +rm -rf eigen2 else - echo "Did you install Mercurial?" +echo "Did you install Mercurial?" fi Modified: trunk/blender/source/blender/blenfont/Makefile === --- trunk/blender/source/blender/blenfont/Makefile 2009-09-25 01:49:06 UTC (rev 23471) +++ trunk/blender/source/blender/blenfont/Makefile 2009-09-25 01:59:43 UTC (rev 23472) @@ -30,5 +30,5 @@ include nan_subdirs.mk ifeq ($(INTERNATIONAL), true) - CPPFLAGS += -DINTERNATIONAL +CPPFLAGS += -DINTERNATIONAL endif Modified: trunk/blender/source/blender/blenlib/intern/BLI_bfile.c === --- trunk/blender/source/blender/blenlib/intern/BLI_bfile.c 2009-09-25 01:49:06 UTC (rev 23471) +++ trunk/blender/source/blender/blenlib/intern/BLI_bfile.c 2009-09-25 01:59:43 UTC (rev 23472) @@ -30,7 +30,7 @@ #include #else #include -#include "BLI_winstuff.h" + #include "BLI_winstuff.h" #endif #include ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23471] trunk/blender/source/creator/ CMakeLists.txt: needed for linking with cmake on unix
Revision: 23471 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23471 Author: campbellbarton Date: 2009-09-25 03:49:06 +0200 (Fri, 25 Sep 2009) Log Message: --- needed for linking with cmake on unix Modified Paths: -- trunk/blender/source/creator/CMakeLists.txt Modified: trunk/blender/source/creator/CMakeLists.txt === --- trunk/blender/source/creator/CMakeLists.txt 2009-09-25 01:43:34 UTC (rev 23470) +++ trunk/blender/source/creator/CMakeLists.txt 2009-09-25 01:49:06 UTC (rev 23471) @@ -362,6 +362,7 @@ blender_ONL bf_python bf_gen_python + bf_ikplugin bf_blenkernel bf_nodes bf_gpu @@ -376,15 +377,12 @@ bf_readblenfile blender_bop bf_kernel - bf_decimation bf_elbeem bf_IK bf_memutil bf_guardedalloc blender_CTR bf_moto - bf_windowmanager - bf_editors bf_blroutines bf_converter bf_dummy @@ -399,17 +397,11 @@ bf_oglrasterizer bf_expressions bf_scenegraph - bf_moto - bf_blroutines kx_network - bf_kernel bf_ngnetwork extern_bullet bf_loopbacknetwork - bf_common - bf_moto - bf_python - bf_gen_python + bf_ITASC extern_binreloc extern_glew extern_libopenjpeg ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23470] trunk/blender/source/blender/ editors/mesh/mesh_ops.c: Quick tweaks to commonly debated mesh-editing hotkeys:
Revision: 23470 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23470 Author: aligorith Date: 2009-09-25 03:43:34 +0200 (Fri, 25 Sep 2009) Log Message: --- Quick tweaks to commonly debated mesh-editing hotkeys: * Loopcut is now just Ctrl-R. The preview will be activated when you do this, and you can just click to confirm as in 2.4x and also like when this was activated from the toolshelf. This is less error prone than having to click at the same time as picking the loop as with the previous hotkey. * Knife is now just: hold k-key and lmb click+drag to draw a cut line and cut the mesh. This is more direct than the (rather arcane) Ctrl-X-LMB-drag, and is quite similar to what's done for Grease Pencil now. Modified Paths: -- trunk/blender/source/blender/editors/mesh/mesh_ops.c Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c === --- trunk/blender/source/blender/editors/mesh/mesh_ops.c2009-09-25 01:30:32 UTC (rev 23469) +++ trunk/blender/source/blender/editors/mesh/mesh_ops.c2009-09-25 01:43:34 UTC (rev 23470) @@ -356,7 +356,7 @@ keymap= WM_keymap_find(wm, "EditMesh", 0, 0); keymap->poll= ED_operator_editmesh; - WM_keymap_add_item(keymap, "MESH_OT_loopcut", ACTIONMOUSE, KM_PRESS, KM_CTRL, RKEY); + WM_keymap_add_item(keymap, "MESH_OT_loopcut", RKEY, KM_PRESS, KM_CTRL, 0); /* selecting */ /* standard mouse selection goes via space_view3d */ @@ -438,7 +438,7 @@ WM_keymap_add_item(keymap, "MESH_OT_fgon_make", FKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "MESH_OT_fgon_clear", FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0); - WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, KM_CTRL, XKEY); + WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, 0, KKEY); /* menus */ WM_keymap_add_item(keymap, "MESH_OT_vertex_specials", VKEY, KM_PRESS, KM_CTRL, 0); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23469] trunk/blender/source/blender: Bugfixes:
Revision: 23469
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23469
Author: aligorith
Date: 2009-09-25 03:30:32 +0200 (Fri, 25 Sep 2009)
Log Message:
---
Bugfixes:
* #19459: Shape Keys not Animateable
Shape Keys were missing the appropriate 'path' callbacks.
* #19458: 3D Viewport doesn't refresh when adding new bone in editmode (using
Shift-A)
The 'wrong' notifier was being sent. Currently, Armature EditMode only responds
to NC_OBJECT|ND_TRANSFORM, which isn't strictly that correct for all cases.
* Alignment code for constraints headers (i.e. enable/disable lumped with the
delete constraint button) was causing the delete button to not work anymore.
Removed the offending code (it shouldn't have been there to start off with).
* When object's don't have their own AnimData (i.e. if you only animate the
values of some shapekeys), a space is no longer left beside the object's name
for a visibility toggle in the Graph Editor.
Modified Paths:
--
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/makesrna/intern/rna_key.c
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2009-09-25 01:29:30 UTC (rev 23468)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2009-09-25 01:30:32 UTC (rev 23469)
@@ -461,6 +461,9 @@
/* check if some setting exists for this channel */
static short acf_object_setting_valid(bAnimContext *ac, bAnimListElem *ale,
int setting)
{
+ Base *base= (Base *)ale->data;
+ Object *ob= base->object;
+
switch (setting) {
/* muted only in NLA */
case ACHANNEL_SETTING_MUTE:
@@ -468,7 +471,7 @@
/* visible only in Graph Editor */
case ACHANNEL_SETTING_VISIBLE:
- return ((ac) && (ac->spacetype == SPACE_IPO));
+ return ((ac) && (ac->spacetype == SPACE_IPO) &&
(ob->adt));
/* only select and expand supported otherwise */
case ACHANNEL_SETTING_SELECT:
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===
--- trunk/blender/source/blender/editors/armature/editarmature.c
2009-09-25 01:29:30 UTC (rev 23468)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2009-09-25 01:30:32 UTC (rev 23469)
@@ -3448,7 +3448,8 @@
else
VecAddf(bone->tail, bone->head, imat[2]); // bone with
unit length 1, pointing up Z
- WM_event_add_notifier(C, NC_OBJECT, obedit);
+ /* note, notifier might evolve */
+ WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, obedit);
return OPERATOR_FINISHED;
}
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2009-09-25 01:29:30 UTC (rev 23468)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2009-09-25 01:30:32 UTC (rev 23469)
@@ -905,10 +905,9 @@
/* Close 'button' - emboss calls here disable drawing of
'button' behind X */
uiBlockSetEmboss(block, UI_EMBOSSN);
- uiBlockBeginAlign(block);
uiDefIconButBitS(block, ICONTOGN, CONSTRAINT_OFF,
B_CONSTRAINT_TEST, ICON_CHECKBOX_DEHLT, xco+243, yco, 19, 19, &con->flag, 0.0,
0.0, 0.0, 0.0, "enable/disable constraint");
+
uiDefIconButO(block, BUT, "CONSTRAINT_OT_delete",
WM_OP_INVOKE_DEFAULT, ICON_X, xco+262, yco, 19, 19, "Delete constraint");
- uiBlockEndAlign(block);
uiBlockSetEmboss(block, UI_EMBOSS);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_key.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_key.c 2009-09-25
01:29:30 UTC (rev 23468)
+++ trunk/blender/source/blender/makesrna/intern/rna_key.c 2009-09-25
01:30:32 UTC (rev 23469)
@@ -257,6 +257,11 @@
return rna_pointer_inherit_refine(&iter->parent, type,
rna_iterator_array_get(iter));
}
+static char *rna_ShapeKey_path(PointerRNA *ptr)
+{
+ return BLI_sprintfN("keys[\"%s\"]", ((KeyBlock*)ptr->data)->name);
+}
+
static void rna_Key_update_data(bContext *C, PointerRNA *ptr)
{
Main *bmain= CTX_data_main(C);
@@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23468] trunk/blender/source/blender/ ikplugin/intern/iksolver_plugin.c: missing includes
Revision: 23468 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23468 Author: campbellbarton Date: 2009-09-25 03:29:30 +0200 (Fri, 25 Sep 2009) Log Message: --- missing includes Modified Paths: -- trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c Modified: trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c === --- trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c 2009-09-25 01:13:07 UTC (rev 23467) +++ trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c 2009-09-25 01:29:30 UTC (rev 23468) @@ -34,6 +34,7 @@ #include "BLI_arithb.h" #include "BKE_armature.h" +#include "BKE_constraint.h" #include "BKE_utildefines.h" #include "DNA_object_types.h" #include "DNA_action_types.h" @@ -43,6 +44,8 @@ #include "IK_solver.h" #include "iksolver_plugin.h" +#include /* memcpy */ + /* ** THE IK SOLVER *** */ /* allocates PoseTree, and links that to root bone/channel */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23467] trunk/blender: SVN maintenance.
Revision: 23467 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23467 Author: gsrb3d Date: 2009-09-25 03:13:07 +0200 (Fri, 25 Sep 2009) Log Message: --- SVN maintenance. Modified Paths: -- trunk/blender/extern/Eigen2/eigen-update.sh trunk/blender/intern/itasc/Armature.cpp trunk/blender/intern/itasc/Cache.cpp trunk/blender/intern/itasc/ConstraintSet.cpp trunk/blender/intern/itasc/ControlledObject.cpp trunk/blender/intern/itasc/CopyPose.cpp trunk/blender/intern/itasc/Distance.cpp trunk/blender/intern/itasc/FixedObject.cpp trunk/blender/intern/itasc/Makefile trunk/blender/intern/itasc/MovingFrame.cpp trunk/blender/intern/itasc/Scene.cpp trunk/blender/intern/itasc/UncontrolledObject.cpp trunk/blender/intern/itasc/WDLSSolver.cpp trunk/blender/intern/itasc/WSDLSSolver.cpp trunk/blender/intern/itasc/WorldObject.cpp trunk/blender/intern/itasc/eigen_types.cpp trunk/blender/intern/itasc/kdl/Makefile trunk/blender/intern/itasc/kdl/frameacc.cpp trunk/blender/intern/itasc/kdl/framevel.cpp trunk/blender/intern/itasc/kdl/utilities/Makefile trunk/blender/intern/itasc/kdl/utilities/error.h trunk/blender/intern/itasc/kdl/utilities/error_stack.cpp trunk/blender/intern/itasc/kdl/utilities/rall1d.h trunk/blender/intern/itasc/kdl/utilities/rall2d.h trunk/blender/intern/itasc/kdl/utilities/utility.h trunk/blender/intern/itasc/kdl/utilities/utility_io.cpp trunk/blender/intern/itasc/kdl/utilities/utility_io.h Property Changed: trunk/blender/extern/Eigen2/eigen-update.sh trunk/blender/intern/itasc/Armature.cpp trunk/blender/intern/itasc/CMakeLists.txt trunk/blender/intern/itasc/Cache.cpp trunk/blender/intern/itasc/ConstraintSet.cpp trunk/blender/intern/itasc/ControlledObject.cpp trunk/blender/intern/itasc/CopyPose.cpp trunk/blender/intern/itasc/Distance.cpp trunk/blender/intern/itasc/FixedObject.cpp trunk/blender/intern/itasc/Makefile trunk/blender/intern/itasc/MovingFrame.cpp trunk/blender/intern/itasc/Scene.cpp trunk/blender/intern/itasc/UncontrolledObject.cpp trunk/blender/intern/itasc/WDLSSolver.cpp trunk/blender/intern/itasc/WSDLSSolver.cpp trunk/blender/intern/itasc/WorldObject.cpp trunk/blender/intern/itasc/eigen_types.cpp trunk/blender/intern/itasc/kdl/Makefile trunk/blender/intern/itasc/kdl/chain.cpp trunk/blender/intern/itasc/kdl/chainfksolverpos_recursive.cpp trunk/blender/intern/itasc/kdl/chainjnttojacsolver.cpp trunk/blender/intern/itasc/kdl/frameacc.cpp trunk/blender/intern/itasc/kdl/frames.cpp trunk/blender/intern/itasc/kdl/frames_io.cpp trunk/blender/intern/itasc/kdl/framevel.cpp trunk/blender/intern/itasc/kdl/inertia.cpp trunk/blender/intern/itasc/kdl/jacobian.cpp trunk/blender/intern/itasc/kdl/jntarray.cpp trunk/blender/intern/itasc/kdl/jntarrayacc.cpp trunk/blender/intern/itasc/kdl/jntarrayvel.cpp trunk/blender/intern/itasc/kdl/joint.cpp trunk/blender/intern/itasc/kdl/kinfam_io.cpp trunk/blender/intern/itasc/kdl/segment.cpp trunk/blender/intern/itasc/kdl/tree.cpp trunk/blender/intern/itasc/kdl/treefksolverpos_recursive.cpp trunk/blender/intern/itasc/kdl/treejnttojacsolver.cpp trunk/blender/intern/itasc/kdl/utilities/Makefile trunk/blender/intern/itasc/kdl/utilities/error.h trunk/blender/intern/itasc/kdl/utilities/error_stack.cpp trunk/blender/intern/itasc/kdl/utilities/error_stack.h trunk/blender/intern/itasc/kdl/utilities/kdl-config.h trunk/blender/intern/itasc/kdl/utilities/rall1d.h trunk/blender/intern/itasc/kdl/utilities/rall2d.h trunk/blender/intern/itasc/kdl/utilities/traits.h trunk/blender/intern/itasc/kdl/utilities/utility.cpp trunk/blender/intern/itasc/kdl/utilities/utility.h trunk/blender/intern/itasc/kdl/utilities/utility_io.cpp trunk/blender/intern/itasc/kdl/utilities/utility_io.h trunk/blender/source/blender/ikplugin/BIK_api.h trunk/blender/source/blender/ikplugin/CMakeLists.txt trunk/blender/source/blender/ikplugin/Makefile trunk/blender/source/blender/ikplugin/intern/Makefile trunk/blender/source/blender/ikplugin/intern/ikplugin_api.c trunk/blender/source/blender/ikplugin/intern/ikplugin_api.h trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.h trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp trunk/blender/source/blender/ikplugin/intern/itasc_plugin.h Modified: trunk/blender/extern/Eigen2/eigen-update.sh === --- trunk/blender/extern/Eigen2/eigen-update.sh 2009-09-24 22:55:57 UTC (rev 23466) +++ trunk/blender/extern/Eigen2/eigen-update.sh 2009-09-25 01:13:07 UTC (rev 23467) @@ -1,28 +1,28 @@ -#!/bin/sh - -echo "*** EIG
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23466] branches/soc-2009-jaguarandi/ source/blender/render: *Added VlakPrimitive ( this rayobject rimitive only stores ObjectRenderInstance and VlakR
Revision: 23466
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23466
Author: jaguarandi
Date: 2009-09-25 00:55:57 +0200 (Fri, 25 Sep 2009)
Log Message:
---
*Added VlakPrimitive (this rayobject rimitive only stores ObjectRenderInstance
and VlakRen pointers)
- it difers from RayFace that localy stored the vertex coordinates.
- basicaly this reduces memory usage
Modified Paths:
--
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/render_types.h
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/renderdatabase.c
Added Paths:
---
branches/soc-2009-jaguarandi/source/blender/render/intern/raytrace/rayobject.cpp
Removed Paths:
-
branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
Modified:
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
===
---
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
2009-09-24 22:11:35 UTC (rev 23465)
+++
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
2009-09-24 22:55:57 UTC (rev 23466)
@@ -52,6 +52,8 @@
struct DerivedMesh;
struct Mesh;
+struct VlakRen;
+struct ObjectInstanceRen;
int RE_rayobject_raycast(RayObject *r, Isect *i);
void RE_rayobject_add(RayObject *r, RayObject *);
@@ -93,14 +95,28 @@
} RayFace;
#define RE_rayface_isQuad(a) ((a)->quad)
-struct VlakRen;
-struct ObjectInstanceRen;
RayObject* RE_rayface_from_vlak(RayFace *face, struct ObjectInstanceRen *obi,
struct VlakRen *vlr);
RayObject* RE_rayface_from_coords(RayFace *rayface, void *ob, void *face,
float *co1, float *co2, float *co3, float *co4);
+/*
+ * This ray object represents faces directly from a given VlakRen structure.
+ * Thus allowing to save memory, but making code triangle intersection
dependant on render structures
+ */
+typedef struct VlakPrimitive
+{
+ struct ObjectInstanceRen *ob;
+ struct VlakRen *face;
+} VlakPrimitive;
+RayObject* RE_vlakprimitive_from_vlak(VlakPrimitive *face, struct
ObjectInstanceRen *obi, struct VlakRen *vlr);
+
+
+
+/*
+ * Raytrace hints
+ */
typedef struct LCTSHint LCTSHint;
struct LCTSHint
{
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
===
---
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
2009-09-24 22:11:35 UTC (rev 23465)
+++
branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
2009-09-24 22:55:57 UTC (rev 23466)
@@ -57,17 +57,18 @@
In order to allow a mixture of RayFace+RayObjects,
all RayObjects must be 4byte aligned, allowing us to use the
- 2 least significant bits (with the mask 0x02) to define the
+ 2 least significant bits (with the mask 0x03) to define the
type of RayObject.
- This leads to 4 possible types of RayObject, but at the moment
- only 2 are used:
+ This leads to 4 possible types of RayObject:
-addr&2 - type of object
+addr&3 - type of object
0 Self (reserved for each structure)
- 1 RayFace
+ 1 RayFace (tri/quad primitive)
2 RayObject (generic with API callbacks)
- 3 RayObject_Vlak
+ 3 VlakPrimitive
+ (vlak primitive - to be used when we have a
vlak describing the data
+eg.: on render code)
0 means it's reserved and has it own meaning inside each ray
acceleration structure
(this way each structure can use the allign offset to determine if a
node represents a
@@ -83,26 +84,16 @@
/* used to unalign a given ray object */
#define RE_rayobject_unalignRayFace(o) ((RayObject*)(((intptr_t)o)|1))
#define RE_rayobject_unalignRayAPI(o) ((RayObject*)(((intptr_t)o)|2))
-#define RE_rayobject_unalignRayVlak(o) ((RayObject*)(((intptr_t)o)|3))
+#define RE_rayobject_unalignVlakPrimitive(o) ((RayObject*)(((intptr_t)o)|3))
/* used to test the type of ray object */
#define RE_rayobject_isAligned(o) intptr_t)o)&3) == 0)
#define RE_rayobject_isRayFace(o) intptr_t)o)&3) == 1)
#define RE_rayobject_isRayAPI(o) intptr_t)o)&3) == 2)
-#define RE_rayobject_isRayVlak(o) intptr_t)o)&3) == 3)
+#define RE_rayobject_isVlakPrimitive(o)intptr_t)o)&3) == 3)
/*
- * This ray ob
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23465] trunk/blender: * some fixes to have scons/mingw compile the sources too, even with BF_DEBUG=1 and WITH_BF_GAMEENGINE=1
Revision: 23465
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23465
Author: jesterking
Date: 2009-09-25 00:11:35 +0200 (Fri, 25 Sep 2009)
Log Message:
---
* some fixes to have scons/mingw compile the sources too, even with BF_DEBUG=1
and WITH_BF_GAMEENGINE=1
Modified Paths:
--
trunk/blender/intern/itasc/kdl/utilities/utility.h
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/VideoTexture/SConscript
Modified: trunk/blender/intern/itasc/kdl/utilities/utility.h
===
--- trunk/blender/intern/itasc/kdl/utilities/utility.h 2009-09-24 21:37:07 UTC
(rev 23464)
+++ trunk/blender/intern/itasc/kdl/utilities/utility.h 2009-09-24 22:11:35 UTC
(rev 23465)
@@ -254,7 +254,8 @@
return fabs( (double)arg );
}
-#ifdef __WIN32__
+
+#if defined(__WIN32__) && !defined(__GNUC__)
inline double hypot(double y,double x) { return ::_hypot(y,x);}
inline double abs(double x) { return ::fabs(x);}
#endif
Modified: trunk/blender/source/gameengine/Ketsji/SConscript
===
--- trunk/blender/source/gameengine/Ketsji/SConscript 2009-09-24 21:37:07 UTC
(rev 23464)
+++ trunk/blender/source/gameengine/Ketsji/SConscript 2009-09-24 22:11:35 UTC
(rev 23465)
@@ -29,7 +29,7 @@
else:
defs.append('DISABLE_SDL')
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
if env['BF_DEBUG']:
defs.append('_DEBUG') # for Python
Modified: trunk/blender/source/gameengine/VideoTexture/SConscript
===
--- trunk/blender/source/gameengine/VideoTexture/SConscript 2009-09-24
21:37:07 UTC (rev 23464)
+++ trunk/blender/source/gameengine/VideoTexture/SConscript 2009-09-24
22:11:35 UTC (rev 23465)
@@ -15,12 +15,11 @@
incs += ' #intern/guardedalloc #extern/glew/include'
defs = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'):
if env['BF_DEBUG']:
defs.append('_DEBUG')
incs += ' ' + env['BF_PYTHON_INC']
-#incs += ' ' + env['BF_OPENGL_INC']
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23464] trunk/lib/windows/python/lib: * scons/mingw: ensure all necessary symbols are visible for debug build when WITH_BF_GAMEENGINE =1.
Revision: 23464 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23464 Author: jesterking Date: 2009-09-24 23:37:07 +0200 (Thu, 24 Sep 2009) Log Message: --- * scons/mingw: ensure all necessary symbols are visible for debug build when WITH_BF_GAMEENGINE=1. Needs commit in trunk/blender to go with. Modified Paths: -- trunk/lib/windows/python/lib/python31_d.def trunk/lib/windows/python/lib/python31mw_d.lib Modified: trunk/lib/windows/python/lib/python31_d.def === --- trunk/lib/windows/python/lib/python31_d.def 2009-09-24 21:22:24 UTC (rev 23463) +++ trunk/lib/windows/python/lib/python31_d.def 2009-09-24 21:37:07 UTC (rev 23464) @@ -28,8 +28,17 @@ PyCObject_Type PyArg_ParseTupleAndKeywords PyExc_ValueError +_PyUnicode_AsStringAndSize +PyObject_Malloc +PyLong_AsLongLong +PyLong_AsVoidPtr PyList_Size PyDict_Type +PyExc_StopIteration +PySequence_List +PyObject_Free +PyModule_Type +PyCallable_Check PyObject_IsSubclass PyMethod_Type PyMethod_Function @@ -57,7 +66,9 @@ _PyObject_DebugFree PyLong_FromLong PyObject_Repr -PyArg_ParseTuple' follow +PyArg_ParseTuple +PyDict_GetItem +PyDict_DelItem PyTuple_SetItem PyMem_Realloc PyNumber_Float @@ -71,6 +82,11 @@ PyModule_AddObject PySys_GetObject PyDict_SetItemString +PyDict_SetItem +PyDict_Update +PyBytes_AsString +PyBytes_Size +PyLong_FromLongLong PyDict_New PyUnicodeUCS2_FromString PyEval_GetBuiltins @@ -101,6 +117,8 @@ PyDict_Clear PyFloat_FromDouble PyRun_StringFlags +PyMarshal_WriteObjectToString +PyMarshal_ReadObjectFromString PyFloat_AsDouble PyModule_Create2TraceRefs PyType_IsSubtype @@ -108,18 +126,29 @@ PyErr_BadArgument PyUnicodeUCS2_FromFormat _PyUnicode_AsString +PySequence_Index +PyDict_Copy PyExc_TypeError PyBool_FromLong PyLong_FromSsize_t PyExc_RuntimeWarning PyErr_WarnEx PyDict_Size +Py_NoSiteFlag +PyObject_RichCompareBool +Py_FrozenFlag +PySequence_Contains +PyImport_AddModule +Py_FatalError +PyExc_ImportError +PyList_GetSlice PyDict_GetItemString PyDict_Next PyExc_RuntimeError PyTuple_New PyCObject_FromVoidPtr PySequence_Check +PySequence_Fast PyObject_IsTrue PyLong_AsSsize_t PyTuple_Size @@ -141,4 +170,4 @@ PyBuffer_Release PyMem_Malloc PySequence_SetItem -PyErr_SetString \ No newline at end of file +PyErr_SetString Modified: trunk/lib/windows/python/lib/python31mw_d.lib === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23463] trunk/blender: Merge of itasc branch.
Revision: 23463 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23463 Author: ben2610 Date: 2009-09-24 23:22:24 +0200 (Thu, 24 Sep 2009) Log Message: --- Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library. Modified Paths: -- trunk/blender/extern/glew/make/msvc_9_0/glew.vcproj trunk/blender/intern/CMakeLists.txt trunk/blender/intern/Makefile trunk/blender/intern/SConscript trunk/blender/intern/audaspace/make/msvc_9_0/audaspace.vcproj trunk/blender/intern/boolop/make/msvc_9_0/boolop.vcproj trunk/blender/intern/bsp/make/msvc_9_0/bsplib.vcproj trunk/blender/intern/container/make/msvc_9_0/container.vcproj trunk/blender/intern/decimation/make/msvc_9_0/decimation.vcproj trunk/blender/intern/elbeem/make/msvc_9_0/elbeem.vcproj trunk/blender/intern/ghost/intern/GHOST_System.cpp trunk/blender/intern/ghost/make/msvc_9_0/ghost.vcproj trunk/blender/intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj trunk/blender/intern/iksolver/make/msvc_9_0/iksolver.vcproj trunk/blender/intern/memutil/make/msvc_9_0/memutil.vcproj trunk/blender/intern/moto/make/msvc_9_0/moto.vcproj trunk/blender/intern/smoke/intern/WTURBULENCE.cpp trunk/blender/intern/smoke/make/msvc_9_0/smoke.vcproj trunk/blender/intern/string/make/msvc_9_0/string.vcproj trunk/blender/projectfiles_vc9/blender/BLO_readblenfile/BLO_readblenfile.vcproj trunk/blender/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj trunk/blender/projectfiles_vc9/blender/avi/BL_avi.vcproj trunk/blender/projectfiles_vc9/blender/blender.sln trunk/blender/projectfiles_vc9/blender/blender.vcproj trunk/blender/projectfiles_vc9/blender/blenfont/BLF_blenfont.vcproj trunk/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj trunk/blender/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj trunk/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj trunk/blender/projectfiles_vc9/blender/gpu/BL_gpu.vcproj trunk/blender/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj trunk/blender/projectfiles_vc9/blender/loader/BLO_loader.vcproj trunk/blender/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj trunk/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj trunk/blender/projectfiles_vc9/blender/render/BRE_render.vcproj trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj trunk/blender/projectfiles_vc9/gameengine/converter/KX_converter.vcproj trunk/blender/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj trunk/blender/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj trunk/blender/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj trunk/blender/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj trunk/blender/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj trunk/blender/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj trunk/blender/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj trunk/blender/projectfiles_vc9/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj trunk/blender/projectfiles_vc9/gameengine/network/network/NG_network.vcproj trunk/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj trunk/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj trunk/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj trunk/blender/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Physics.vcproj trunk/blender/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj trunk/blender/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj trunk/blender/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj trunk/blender/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj trunk/blender/projectfiles_vc9/kernel/gen_messaging/gen_messaging.vcproj trunk/blender/projectfiles_vc9/kernel/system/SYS_system.vcproj trunk/blender/release/ui/buttons_data_bone.py trunk/blender/release/ui/buttons_object_constraint.py trunk/blender/source/blender/CMakeLists.txt trunk/blender/source/blender/Makefile trunk/blender/source/blender/SConscript trunk/blender/source/blender/blenkernel/BKE_action.h trunk/blender/source/blender/blenkernel/BKE_armature.h trunk/blender/source/blender/blenkernel/BKE_constraint.h trunk/blender/source/blender/blenkernel/CMakeLists.txt trunk/blender/source/blender/blenkernel/SConscript trunk/
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23462] trunk/blender/release/io/netrender : netrender: usage based balancer.
Revision: 23462
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23462
Author: theeth
Date: 2009-09-24 23:05:54 +0200 (Thu, 24 Sep 2009)
Log Message:
---
netrender: usage based balancer. more useful than credits
Modified Paths:
--
trunk/blender/release/io/netrender/balancing.py
trunk/blender/release/io/netrender/master.py
trunk/blender/release/io/netrender/master_html.py
trunk/blender/release/io/netrender/model.py
Modified: trunk/blender/release/io/netrender/balancing.py
===
--- trunk/blender/release/io/netrender/balancing.py 2009-09-24 20:20:43 UTC
(rev 23461)
+++ trunk/blender/release/io/netrender/balancing.py 2009-09-24 21:05:54 UTC
(rev 23462)
@@ -64,8 +64,14 @@
class RatingCredit(RatingRule):
def rate(self, job):
- return -job.credits * job.priority # more credit is better
(sort at first in list)
+ # more credit is better (sort at first in list)
+ return -job.credits * job.priority
+class RatingUsage(RatingRule):
+ def rate(self, job):
+ # less usage is better
+ return job.usage / job.priority
+
class NewJobPriority(PriorityRule):
def __init__(self, limit = 1):
self.limit = limit
Modified: trunk/blender/release/io/netrender/master.py
===
--- trunk/blender/release/io/netrender/master.py2009-09-24 20:20:43 UTC
(rev 23461)
+++ trunk/blender/release/io/netrender/master.py2009-09-24 21:05:54 UTC
(rev 23462)
@@ -45,12 +45,12 @@
self.frames = []
self.chunks = chunks
self.priority = priority
+ self.usage = 0.0
self.credits = credits
self.blacklist = blacklist
self.last_dispatched = time.time()
# special server properties
- self.usage = 0.0
self.last_update = 0
self.save_path = ""
self.files_map = {path: MRenderFile(path, start, end) for path,
start, end in files}
@@ -603,9 +603,10 @@
self.first_usage = True
self.balancer = netrender.balancing.Balancer()
- self.balancer.addRule(netrender.balancing.RatingCredit())
+ #self.balancer.addRule(netrender.balancing.RatingCredit())
+ self.balancer.addRule(netrender.balancing.RatingUsage())
self.balancer.addException(netrender.balancing.ExcludeQueuedEmptyJob())
-
self.balancer.addException(netrender.balancing.ExcludeSlavesLimit(self.countJobs,
self.countSlaves))
+
self.balancer.addException(netrender.balancing.ExcludeSlavesLimit(self.countJobs,
self.countSlaves, limit = 0.9))
self.balancer.addPriority(netrender.balancing.NewJobPriority())
self.balancer.addPriority(netrender.balancing.MinimumTimeBetweenDispatchPriority(limit
= 2))
Modified: trunk/blender/release/io/netrender/master_html.py
===
--- trunk/blender/release/io/netrender/master_html.py 2009-09-24 20:20:43 UTC
(rev 23461)
+++ trunk/blender/release/io/netrender/master_html.py 2009-09-24 21:05:54 UTC
(rev 23462)
@@ -52,22 +52,36 @@
output("Jobs")
startTable()
- headerTable("name", "credits", "usage", "time since last",
"length", "done", "dispatched", "error", "priority", "exception")
+ headerTable(
+ "name",
+
"priority",
+
"credits",
+ "usage",
+ "wait",
+
"length",
+ "done",
+
"dispatched",
+ "error",
+ "first",
+
"exception"
+ )
handler.server.update()
for job in handler.server.jobs:
results = job.framesStatus()
- rowTable( link(job.name, "/html/job" + job.id),
+ rowTable(
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23461] trunk/blender/source/gameengine: * explicit cast needed for mingw.
Revision: 23461
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23461
Author: jesterking
Date: 2009-09-24 22:20:43 +0200 (Thu, 24 Sep 2009)
Log Message:
---
* explicit cast needed for mingw.
Modified Paths:
--
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/Ketsji/KX_PyMath.h
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
===
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2009-09-24
19:52:32 UTC (rev 23460)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2009-09-24
20:20:43 UTC (rev 23461)
@@ -112,13 +112,13 @@
static PyAttributeDef Attributes[]; \
virtual PyTypeObject *GetType(void) {return &Type;}; \
virtual PyObject *GetProxy() {return GetProxy_Ext(this, &Type);}; \
- virtual PyObject *NewProxy(bool py_owns) {return NewProxy_Ext(this, &Type,
py_owns);}; \
+ virtual PyObject *NewProxy(bool py_owns) {return NewProxy_Ext(this, &Type,
py_owns);};
#ifdef WITH_CXX_GUARDEDALLOC
#define Py_Header __Py_Header \
void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes,
Type.tp_name); } \
- void operator delete( void *mem ) { MEM_freeN(mem); } \
+ void operator delete( void *mem ) { MEM_freeN(mem); }
#else
#define Py_Header __Py_Header
Modified: trunk/blender/source/gameengine/Ketsji/KX_PyMath.h
===
--- trunk/blender/source/gameengine/Ketsji/KX_PyMath.h 2009-09-24 19:52:32 UTC
(rev 23460)
+++ trunk/blender/source/gameengine/Ketsji/KX_PyMath.h 2009-09-24 20:20:43 UTC
(rev 23461)
@@ -157,7 +157,7 @@
return true;
}
- else if (PyObject_TypeCheck(pyval, &PyObjectPlus::Type))
+ else if (PyObject_TypeCheck(pyval, (PyTypeObject *)&PyObjectPlus::Type))
{ /* note, include this check because PySequence_Check does too
much introspection
* on the PyObject (like getting its __class__, on a BGE type
this means searching up
* the parent list each time only to discover its not a
sequence.
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23460] trunk/blender/release/io/netrender : netrender: draft code for cluster usage per job calculations.
Revision: 23460
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23460
Author: theeth
Date: 2009-09-24 21:52:32 +0200 (Thu, 24 Sep 2009)
Log Message:
---
netrender: draft code for cluster usage per job calculations. Eventually, this
will be used for load balancing
Modified Paths:
--
trunk/blender/release/io/netrender/balancing.py
trunk/blender/release/io/netrender/master.py
trunk/blender/release/io/netrender/master_html.py
trunk/blender/release/io/netrender/ui.py
Modified: trunk/blender/release/io/netrender/balancing.py
===
--- trunk/blender/release/io/netrender/balancing.py 2009-09-24 19:50:15 UTC
(rev 23459)
+++ trunk/blender/release/io/netrender/balancing.py 2009-09-24 19:52:32 UTC
(rev 23460)
@@ -91,4 +91,4 @@
self.limit = limit
def test(self, job):
- return not ( self.count_jobs() == 1 or self.count_slaves() == 1
or float(job.countSlaves() + 1) / self.count_slaves() <= self.limit )
+ return not ( self.count_jobs() == 1 or self.count_slaves() <= 1
or float(job.countSlaves() + 1) / self.count_slaves() <= self.limit )
Modified: trunk/blender/release/io/netrender/master.py
===
--- trunk/blender/release/io/netrender/master.py2009-09-24 19:50:15 UTC
(rev 23459)
+++ trunk/blender/release/io/netrender/master.py2009-09-24 19:52:32 UTC
(rev 23460)
@@ -29,7 +29,7 @@
self.last_seen = time.time()
self.job = None
- self.frame = None
+ self.job_frames = []
netrender.model.RenderSlave._slave_map[self.id] = self
@@ -50,6 +50,7 @@
self.last_dispatched = time.time()
# special server properties
+ self.usage = 0.0
self.last_update = 0
self.save_path = ""
self.files_map = {path: MRenderFile(path, start, end) for path,
start, end in files}
@@ -300,6 +301,9 @@
f.status = DISPATCHED
f.slave = slave
+ slave.job = job
+ slave.job_frames = [f.number for f in
frames]
+
self.send_head(headers={"job-id":
job.id})
message = job.serialize(frames)
@@ -536,7 +540,11 @@
elif job_result == ERROR:
# blacklist slave on this job
on error
job.blacklist.append(slave.id)
-
+
+ slave.job_frames.remove(job_frame)
+ if not slave.job_frames:
+ slave.job = None
+
frame.status = job_result
frame.time = job_time
@@ -590,6 +598,10 @@
self.job_id = 0
self.path = path + "master_" + str(os.getpid()) + os.sep
+ self.slave_timeout = 2
+
+ self.first_usage = True
+
self.balancer = netrender.balancing.Balancer()
self.balancer.addRule(netrender.balancing.RatingCredit())
self.balancer.addException(netrender.balancing.ExcludeQueuedEmptyJob())
@@ -611,6 +623,10 @@
return slave.id
+ def removeSlave(self, slave):
+ self.slaves.remove(slave)
+ self.slaves_map.pop(slave.id)
+
def getSlave(self, slave_id):
return self.slaves_map.get(slave_id, None)
@@ -621,9 +637,46 @@
return slave
+ def timeoutSlaves(self):
+ removed = []
+
+ t = time.time()
+
+ for slave in self.slaves:
+ if (t - slave.last_seen) / 60 > self.slave_timeout:
+ removed.append(slave)
+
+ if slave.job:
+ for f in slave.job_frames:
+ slave.job[f].status = ERROR
+
+ for slave in removed:
+ self.remo
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23459] trunk/blender/source: * fix snprintf error with mingw
Revision: 23459
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23459
Author: jesterking
Date: 2009-09-24 21:50:15 +0200 (Thu, 24 Sep 2009)
Log Message:
---
* fix snprintf error with mingw
* move header guards to the right place.
Modified Paths:
--
trunk/blender/source/blender/blenlib/BLI_winstuff.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h
===
--- trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 16:18:17 UTC
(rev 23458)
+++ trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 19:50:15 UTC
(rev 23459)
@@ -29,6 +29,9 @@
* * END GPL LICENSE BLOCK *
*/
+#ifndef __WINSTUFF_H__
+#define __WINSTUFF_H__
+
#ifndef FREE_WINDOWS
#pragma warning(once: 4761 4305 4244 4018)
#endif
@@ -59,11 +62,8 @@
#undef small
-#ifndef __WINSTUFF_H__
-#define __WINSTUFF_H__
+// These definitions are also in arithb for simplicity
- // These definitions are also in arithb for simplicity
-
#ifdef __cplusplus
extern "C" {
#endif
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
===
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
2009-09-24 16:18:17 UTC (rev 23458)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
2009-09-24 19:50:15 UTC (rev 23459)
@@ -44,6 +44,7 @@
* This little block needed for linking to Blender...
*/
#ifdef WIN32
+#include
#include "BLI_winstuff.h"
#endif
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23458] trunk/blender/intern/smoke/intern/ FLUID_3D_STATIC.cpp: fixed some indentation, and removed
Revision: 23458
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23458
Author: sirdude
Date: 2009-09-24 18:18:17 +0200 (Thu, 24 Sep 2009)
Log Message:
---
fixed some indentation, and removed
declaration of index in a couple of places because it was
already defined and safe to use the old def.
Kent
Modified Paths:
--
trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp
Modified: trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp
===
--- trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp 2009-09-24
15:36:00 UTC (rev 23457)
+++ trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp 2009-09-24
16:18:17 UTC (rev 23458)
@@ -54,23 +54,21 @@
float yTotal = dx * res[1];
float zTotal = dx * res[2];
- float heighMin = 0.05;
- float heighMax = 0.10;
+ float heighMin = 0.05;
+ float heighMax = 0.10;
- for (int y = 0; y < res[2]; y++)
-for (int z = (int)(heighMin*res[2]); z <= (int)(heighMax * res[2]); z++)
- for (int x = 0; x < res[0]; x++)
- {
-float xLength = x * dx - xTotal * 0.4f;
-float yLength = y * dx - yTotal * 0.5f;
-float radius = sqrtf(xLength * xLength + yLength * yLength);
+ for (int y = 0; y < res[2]; y++)
+ for (int z = (int)(heighMin*res[2]); z <= (int)(heighMax *
res[2]); z++)
+ for (int x = 0; x < res[0]; x++) {
+ float xLength = x * dx - xTotal * 0.4f;
+ float yLength = y * dx - yTotal * 0.5f;
+ float radius = sqrtf(xLength * xLength +
yLength * yLength);
-if (radius < 0.075f * xTotal)
-{
- int index = x + y * res[0] + z * slabSize;
- field[index] = 1.0f;
-}
- }
+ if (radius < 0.075f * xTotal) {
+ int index = x + y * res[0] + z *
slabSize;
+ field[index] = 1.0f;
+ }
+ }
}
@@ -98,7 +96,7 @@
for (int z = 0; z < res[2]; z++)
{
// top slab
- int index = y * res[0] + z * slabSize;
+ index = y * res[0] + z * slabSize;
index += res[0] - 1;
if(field[index]<0.) field[index] = 0.;
index -= 1;
@@ -130,7 +128,7 @@
for (int x = 0; x < res[0]; x++)
{
// top slab
- int index = x + z * slabSize;
+ index = x + z * slabSize;
index += slabSize - res[0];
if(field[index]<0.) field[index] = 0.;
index -= res[0];
@@ -164,7 +162,7 @@
for (int x = 0; x < res[0]; x++)
{
// top slab
- int index = x + y * res[0];
+ index = x + y * res[0];
index += totalCells - slabSize;
if(field[index]<0.) field[index] = 0.;
index -= slabSize;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23457] trunk/blender: add buildinfo to cmake (no win32 support)
Revision: 23457
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23457
Author: campbellbarton
Date: 2009-09-24 17:36:00 +0200 (Thu, 24 Sep 2009)
Log Message:
---
add buildinfo to cmake (no win32 support)
Modified Paths:
--
trunk/blender/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/creator/creator.c
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2009-09-24 14:39:14 UTC (rev 23456)
+++ trunk/blender/CMakeLists.txt2009-09-24 15:36:00 UTC (rev 23457)
@@ -76,7 +76,7 @@
OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
OPTION(WITH_SNDFILE "Enable libsndfile Support
(http://www.mega-nerd.com/libsndfile)" OFF)
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation"
OFF)
-# OPTION(WITH_BUILDINFO "Include extra build details" ON)
+OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_INSTALL "Install accompanying scripts and language files
needed to run blender" ON)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -517,15 +517,15 @@
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-# TODO - buildinfo
-# IF(UNIX)
-# IF(WITH_BUILDINFO)
-# EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
-# EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)
-# EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
-# SET(BUILD_TYPE ${CMAKE_BUILD_TYPE})
-# ENDIF(WITH_BUILDINFO)
-# ENDIF(UNIX)
+# buildinfo
+IF(UNIX)
+ IF(WITH_BUILDINFO)
+ EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
+ EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)
+ EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE
BUILD_REV)
+ # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
+ ENDIF(WITH_BUILDINFO)
+ENDIF(UNIX)
#-
# Common.
Modified: trunk/blender/source/creator/CMakeLists.txt
===
--- trunk/blender/source/creator/CMakeLists.txt 2009-09-24 14:39:14 UTC (rev
23456)
+++ trunk/blender/source/creator/CMakeLists.txt 2009-09-24 15:36:00 UTC (rev
23457)
@@ -78,15 +78,27 @@
INCLUDE_DIRECTORIES(${BINRELOC_INC})
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-MESSAGE(STATUS "Configuring blender")
+# Setup the exe sources and buildinfo
+SET(EXESRC creator.c)
IF(WIN32)
- ADD_EXECUTABLE(blender ${EXETYPE} creator.c ../icons/winblender.rc)
-ELSE(WIN32)
- ADD_EXECUTABLE(blender ${EXETYPE} creator.c)
+ SET(EXESRC ${EXESRC} ../icons/winblender.rc)
ENDIF(WIN32)
+IF(WITH_BUILDINFO)
+ ADD_DEFINITIONS(-DBUILD_DATE="${BUILD_DATE}")
+ ADD_DEFINITIONS(-DBUILD_TIME="${BUILD_TIME}")
+ ADD_DEFINITIONS(-DBUILD_REV="${BUILD_REV}")
+ ADD_DEFINITIONS(-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}")
+ ADD_DEFINITIONS(-DBUILD_TYPE="${CMAKE_BUILD_TYPE}")
+
+ SET(EXESRC ${EXESRC} buildinfo.c)
+ENDIF(WITH_BUILDINFO)
+MESSAGE(STATUS "Configuring blender")
+
+ADD_EXECUTABLE(blender ${EXETYPE} ${EXESRC})
+
# Post build steps for bundling/packaging.
SET(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
Modified: trunk/blender/source/creator/creator.c
===
--- trunk/blender/source/creator/creator.c 2009-09-24 14:39:14 UTC (rev
23456)
+++ trunk/blender/source/creator/creator.c 2009-09-24 15:36:00 UTC (rev
23457)
@@ -101,6 +101,7 @@
#ifdef BUILD_DATE
extern char * build_date;
extern char * build_time;
+extern char * build_rev;
extern char * build_platform;
extern char * build_type;
#endif
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23456] branches/itasc/source/blender: svn merge -r 23448:23455 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 23456
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23456
Author: ben2610
Date: 2009-09-24 16:39:14 +0200 (Thu, 24 Sep 2009)
Log Message:
---
svn merge -r 23448:23455
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--
branches/itasc/source/blender/blenlib/BLI_winstuff.h
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/editors/space_console/space_console.c
branches/itasc/source/blender/render/intern/source/texture.c
Modified: branches/itasc/source/blender/blenlib/BLI_winstuff.h
===
--- branches/itasc/source/blender/blenlib/BLI_winstuff.h2009-09-24
14:33:05 UTC (rev 23455)
+++ branches/itasc/source/blender/blenlib/BLI_winstuff.h2009-09-24
14:39:14 UTC (rev 23456)
@@ -28,7 +28,10 @@
*
* * END GPL LICENSE BLOCK *
*/
+
+#ifndef FREE_WINDOWS
#pragma warning(once: 4761 4305 4244 4018)
+#endif
#define WIN32_LEAN_AND_MEAN
Modified: branches/itasc/source/blender/blenloader/intern/readfile.c
===
--- branches/itasc/source/blender/blenloader/intern/readfile.c 2009-09-24
14:33:05 UTC (rev 23455)
+++ branches/itasc/source/blender/blenloader/intern/readfile.c 2009-09-24
14:39:14 UTC (rev 23456)
@@ -9377,7 +9377,7 @@
strcpy(sce->nodetree->id.name, "NTComposit
Nodetree");
/* move to cameras */
- if(sce->r.scemode & R_PANORAMA) {
+ if(sce->r.mode & R_PANORAMA) {
for(base=sce->base.first; base;
base=base->next) {
ob= newlibadr(fd, lib, base->object);
@@ -9387,7 +9387,7 @@
}
}
- sce->r.scemode &= ~R_PANORAMA;
+ sce->r.mode &= ~R_PANORAMA;
}
}
/* and texture trees */
Modified: branches/itasc/source/blender/editors/space_console/space_console.c
===
--- branches/itasc/source/blender/editors/space_console/space_console.c
2009-09-24 14:33:05 UTC (rev 23455)
+++ branches/itasc/source/blender/editors/space_console/space_console.c
2009-09-24 14:39:14 UTC (rev 23456)
@@ -174,6 +174,9 @@
console_scrollback_add_str(C, "Autocomplete: Ctrl+Space",
0);
console_scrollback_add_str(C, "Ctrl +/- Wheel: Zoom", 0);
console_scrollback_add_str(C, "Builtin Modules: bpy, bpy.data,
bpy.ops, bpy.props, bpy.types, bpy.ui", 0);
+
+ /* This is normally set by python but to start with its easier
just to set it like this rather then running python with no args */
+ strcpy(sc->prompt, ">>> ");
}
/* clear and setup matrix */
Modified: branches/itasc/source/blender/render/intern/source/texture.c
===
--- branches/itasc/source/blender/render/intern/source/texture.c
2009-09-24 14:33:05 UTC (rev 23455)
+++ branches/itasc/source/blender/render/intern/source/texture.c
2009-09-24 14:39:14 UTC (rev 23456)
@@ -1631,7 +1631,7 @@
float fact, facm, factt, facmm, stencilTin=1.0;
float texvec[3], dxt[3], dyt[3], tempvec[3], norvec[3],
warpvec[3]={0.0f, 0.0f, 0.0f}, Tnor=1.0;
int tex_nr, rgbnor= 0, warpdone=0;
- float nu[3], nv[3], nn[3] = {0,0,0}, dudnu = 1.f, dudnv = 0.f, dvdnu =
0.f, dvdnv = 1.f; // bump mapping
+ float nu[3] = {0,0,0}, nv[3] = {0,0,0}, nn[3] = {0,0,0}, dudnu = 1.f,
dudnv = 0.f, dvdnu = 0.f, dvdnv = 1.f; // bump mapping
int nunvdone= 0;
if (R.r.scemode & R_NO_TEX) return;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23455] branches/itasc/extern/Eigen2: Upgrade Eigen2 to version 2.0.6
Revision: 23455 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23455 Author: ben2610 Date: 2009-09-24 16:33:05 +0200 (Thu, 24 Sep 2009) Log Message: --- Upgrade Eigen2 to version 2.0.6 Modified Paths: -- branches/itasc/extern/Eigen2/Eigen/Cholesky branches/itasc/extern/Eigen2/Eigen/Core branches/itasc/extern/Eigen2/Eigen/LeastSquares branches/itasc/extern/Eigen2/Eigen/Sparse branches/itasc/extern/Eigen2/Eigen/StdVector branches/itasc/extern/Eigen2/Eigen/src/Array/PartialRedux.h branches/itasc/extern/Eigen2/Eigen/src/Array/Random.h branches/itasc/extern/Eigen2/Eigen/src/Cholesky/LDLT.h branches/itasc/extern/Eigen2/Eigen/src/Cholesky/LLT.h branches/itasc/extern/Eigen2/Eigen/src/Core/Block.h branches/itasc/extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h branches/itasc/extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h branches/itasc/extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h branches/itasc/extern/Eigen2/Eigen/src/Core/MathFunctions.h branches/itasc/extern/Eigen2/Eigen/src/Core/Matrix.h branches/itasc/extern/Eigen2/Eigen/src/Core/MatrixBase.h branches/itasc/extern/Eigen2/Eigen/src/Core/Part.h branches/itasc/extern/Eigen2/Eigen/src/Core/Product.h branches/itasc/extern/Eigen2/Eigen/src/Core/Transpose.h branches/itasc/extern/Eigen2/Eigen/src/Core/Visitor.h branches/itasc/extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h branches/itasc/extern/Eigen2/Eigen/src/Core/util/Constants.h branches/itasc/extern/Eigen2/Eigen/src/Core/util/Macros.h branches/itasc/extern/Eigen2/Eigen/src/Core/util/Memory.h branches/itasc/extern/Eigen2/Eigen/src/Core/util/StaticAssert.h branches/itasc/extern/Eigen2/Eigen/src/Geometry/EulerAngles.h branches/itasc/extern/Eigen2/Eigen/src/Geometry/Quaternion.h branches/itasc/extern/Eigen2/Eigen/src/Geometry/Rotation2D.h branches/itasc/extern/Eigen2/Eigen/src/Geometry/Transform.h branches/itasc/extern/Eigen2/Eigen/src/LU/LU.h branches/itasc/extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h branches/itasc/extern/Eigen2/Eigen/src/QR/EigenSolver.h branches/itasc/extern/Eigen2/Eigen/src/QR/QR.h branches/itasc/extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h branches/itasc/extern/Eigen2/Eigen/src/QR/Tridiagonalization.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseBlock.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseProduct.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseUtil.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseVector.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h branches/itasc/extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h branches/itasc/extern/Eigen2/eigen-update.sh Added Paths: --- branches/itasc/extern/Eigen2/Eigen/Dense branches/itasc/extern/Eigen2/Eigen/Eigen branches/itasc/extern/Eigen2/Eigen/NewStdVector branches/itasc/extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h Modified: branches/itasc/extern/Eigen2/Eigen/Cholesky === --- branches/itasc/extern/Eigen2/Eigen/Cholesky 2009-09-24 12:49:41 UTC (rev 23454) +++ branches/itasc/extern/Eigen2/Eigen/Cholesky 2009-09-24 14:33:05 UTC (rev 23455) @@ -38,8 +38,8 @@ } // namespace Eigen #define EIGEN_CHOLESKY_MODULE_INSTANTIATE_TYPE(MATRIXTYPE,PREFIX) \ - PREFIX template class Cholesky; \ - PREFIX template class CholeskyWithoutSquareRoot + PREFIX template class LLT; \ + PREFIX template class LDLT #define EIGEN_CHOLESKY_MODULE_INSTANTIATE(PREFIX) \ EIGEN_CHOLESKY_MODULE_INSTANTIATE_TYPE(Matrix2f,PREFIX); \ Modified: branches/itasc/extern/Eigen2/Eigen/Core === --- branches/itasc/extern/Eigen2/Eigen/Core 2009-09-24 12:49:41 UTC (rev 23454) +++ branches/itasc/extern/Eigen2/Eigen/Core 2009-09-24 14:33:05 UTC (rev 23455) @@ -7,11 +7,10 @@ #ifdef _MSC_VER #include // for _aligned_malloc -- need it regardless of whether vectorization is enabled #if (_MSC_VER >= 1500) // 2008 or later -// Remember that usage of defined() in a #define is undefined by the standard -#ifdef _M_IX86_FP - #if _M_IX86_FP >= 2 -#define EIGEN_SSE2_ON_MSVC_2008_OR_LATER - #endif +// Remember that usage of defined() i
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23453] branches/itasc/source/blender/ editors/include/ED_transform.h: Try to fix an SVN checksum problem
Revision: 23453 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23453 Author: ben2610 Date: 2009-09-24 14:41:20 +0200 (Thu, 24 Sep 2009) Log Message: --- Try to fix an SVN checksum problem Modified Paths: -- branches/itasc/source/blender/editors/include/ED_transform.h Modified: branches/itasc/source/blender/editors/include/ED_transform.h === --- branches/itasc/source/blender/editors/include/ED_transform.h 2009-09-24 12:27:20 UTC (rev 23452) +++ branches/itasc/source/blender/editors/include/ED_transform.h 2009-09-24 12:41:20 UTC (rev 23453) @@ -40,8 +40,10 @@ struct Object; struct uiLayout; struct EnumPropertyItem; +struct wmOperatorType; +struct wmKeyMap; -void transform_keymap_for_space(struct wmWindowManager *wm, struct ListBase *keymap, int spaceid); +void transform_keymap_for_space(struct wmWindowManager *wm, struct wmKeyMap *keymap, int spaceid); void transform_operatortypes(void); /* Macros & Prototypes *** */ @@ -73,7 +75,8 @@ TFM_BAKE_TIME, TFM_BEVEL, TFM_BWEIGHT, - TFM_ALIGN + TFM_ALIGN, + TFM_EDGE_SLIDE } TfmMode; /* TRANSFORM CONTEXTS */ @@ -131,8 +134,6 @@ void Properties_Constraints(struct wmOperatorType *ot); /* view3d manipulators */ -void initManipulator(int mode); -void ManipulatorTransform(); int BIF_do_manipulator(struct bContext *C, struct wmEvent *event, struct wmOperator *op); void BIF_draw_manipulator(const struct bContext *C); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23452] trunk/blender/source/blender/ render/intern/source/texture.c: imagewrap was using uninitialized vars from do_material_tex
Revision: 23452
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23452
Author: campbellbarton
Date: 2009-09-24 14:27:20 +0200 (Thu, 24 Sep 2009)
Log Message:
---
imagewrap was using uninitialized vars from do_material_tex
found while looking into a different bug.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/source/blender/render/intern/source/texture.c
===
--- trunk/blender/source/blender/render/intern/source/texture.c 2009-09-24
12:15:17 UTC (rev 23451)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2009-09-24
12:27:20 UTC (rev 23452)
@@ -1631,7 +1631,7 @@
float fact, facm, factt, facmm, stencilTin=1.0;
float texvec[3], dxt[3], dyt[3], tempvec[3], norvec[3],
warpvec[3]={0.0f, 0.0f, 0.0f}, Tnor=1.0;
int tex_nr, rgbnor= 0, warpdone=0;
- float nu[3], nv[3], nn[3] = {0,0,0}, dudnu = 1.f, dudnv = 0.f, dvdnu =
0.f, dvdnv = 1.f; // bump mapping
+ float nu[3] = {0,0,0}, nv[3] = {0,0,0}, nn[3] = {0,0,0}, dudnu = 1.f,
dudnv = 0.f, dvdnu = 0.f, dvdnv = 1.f; // bump mapping
int nunvdone= 0;
if (R.r.scemode & R_NO_TEX) return;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23451] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix for panorama backwards compatibility not working correct.
Revision: 23451
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23451
Author: blendix
Date: 2009-09-24 14:15:17 +0200 (Thu, 24 Sep 2009)
Log Message:
---
Fix for panorama backwards compatibility not working correct.
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-24
11:46:17 UTC (rev 23450)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-24
12:15:17 UTC (rev 23451)
@@ -9366,7 +9366,7 @@
strcpy(sce->nodetree->id.name, "NTComposit
Nodetree");
/* move to cameras */
- if(sce->r.scemode & R_PANORAMA) {
+ if(sce->r.mode & R_PANORAMA) {
for(base=sce->base.first; base;
base=base->next) {
ob= newlibadr(fd, lib, base->object);
@@ -9376,7 +9376,7 @@
}
}
- sce->r.scemode &= ~R_PANORAMA;
+ sce->r.mode &= ~R_PANORAMA;
}
}
/* and texture trees */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23450] trunk/blender/source/blender/ blenlib/BLI_winstuff.h: mingw - silencing the warnings about '#pragma' warnings being unrecognised or being igno
Revision: 23450 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23450 Author: aligorith Date: 2009-09-24 13:46:17 +0200 (Thu, 24 Sep 2009) Log Message: --- mingw - silencing the warnings about '#pragma' warnings being unrecognised or being ignored. This should still work fine for msvc, and other platforms though. Modified Paths: -- trunk/blender/source/blender/blenlib/BLI_winstuff.h Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h === --- trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 11:37:33 UTC (rev 23449) +++ trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 11:46:17 UTC (rev 23450) @@ -28,7 +28,10 @@ * * * END GPL LICENSE BLOCK * */ + +#ifndef FREE_WINDOWS #pragma warning(once: 4761 4305 4244 4018) +#endif #define WIN32_LEAN_AND_MEAN ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23449] trunk/blender/source/blender/ editors/space_console/space_console.c: fix for [#19437] Console (Python): first run doesn't have the ">>>"
Revision: 23449 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23449 Author: campbellbarton Date: 2009-09-24 13:37:33 +0200 (Thu, 24 Sep 2009) Log Message: --- fix for [#19437] Console (Python): first run doesn't have the ">>>" Modified Paths: -- trunk/blender/source/blender/editors/space_console/space_console.c Modified: trunk/blender/source/blender/editors/space_console/space_console.c === --- trunk/blender/source/blender/editors/space_console/space_console.c 2009-09-24 10:46:52 UTC (rev 23448) +++ trunk/blender/source/blender/editors/space_console/space_console.c 2009-09-24 11:37:33 UTC (rev 23449) @@ -174,6 +174,9 @@ console_scrollback_add_str(C, "Autocomplete: Ctrl+Space", 0); console_scrollback_add_str(C, "Ctrl +/- Wheel: Zoom", 0); console_scrollback_add_str(C, "Builtin Modules: bpy, bpy.data, bpy.ops, bpy.props, bpy.types, bpy.ui", 0); + + /* This is normally set by python but to start with its easier just to set it like this rather then running python with no args */ + strcpy(sc->prompt, ">>> "); } /* clear and setup matrix */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23448] trunk/blender/source/blender/ editors/interface/interface.c: Fix #19446: merge operator needs to be undone twice, interface
Revision: 23448 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23448 Author: blendix Date: 2009-09-24 12:46:52 +0200 (Thu, 24 Sep 2009) Log Message: --- Fix #19446: merge operator needs to be undone twice, interface was still doing undo pushes in cases it was not needed. Modified Paths: -- trunk/blender/source/blender/editors/interface/interface.c Modified: trunk/blender/source/blender/editors/interface/interface.c === --- trunk/blender/source/blender/editors/interface/interface.c 2009-09-24 10:41:28 UTC (rev 23447) +++ trunk/blender/source/blender/editors/interface/interface.c 2009-09-24 10:46:52 UTC (rev 23448) @@ -2271,8 +2271,9 @@ } } - if(!ELEM7(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, SEARCH_MENU)) - but->flag |= UI_BUT_UNDO; + if(ELEM8(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, SEARCH_MENU, BUTM)); + else if(ELEM5(but->type, SCROLL, SEPR, LINK, INLINK, FTPREVIEW)); + else but->flag |= UI_BUT_UNDO; BLI_addtail(&block->buttons, but); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23447] trunk/blender/source/blender/ blenlib/BLI_winstuff.h: 3rd attempt to fix ssize_t problem in MSVC and mingw
Revision: 23447 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23447 Author: ben2610 Date: 2009-09-24 12:41:28 +0200 (Thu, 24 Sep 2009) Log Message: --- 3rd attempt to fix ssize_t problem in MSVC and mingw Modified Paths: -- trunk/blender/source/blender/blenlib/BLI_winstuff.h Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h === --- trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 10:35:04 UTC (rev 23446) +++ trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 10:41:28 UTC (rev 23447) @@ -91,12 +91,13 @@ typedef unsigned int mode_t; #endif +/* mingw using _SSIZE_T_ to declare ssize_t type */ #ifndef _SSIZE_T_ #define _SSIZE_T_ -#if defined(_WIN64) -typedef __int64 ssize_t; -#else -typedef _W64 int ssize_t; +/* python uses HAVE_SSIZE_T */ +#ifndef HAVE_SSIZE_T +#define HAVE_SSIZE_T 1 +typedef long ssize_t; #endif #endif ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23446] trunk/blender/source/blender: fix for middle mouse up events not working with modal keymaps ( used for fly mode).
Revision: 23446
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23446
Author: campbellbarton
Date: 2009-09-24 12:35:04 +0200 (Thu, 24 Sep 2009)
Log Message:
---
fix for middle mouse up events not working with modal keymaps (used for fly
mode).
With mouse events event->val started as 0/1 for press/release but later the
tweak function made LMB and RMB zero value into KM_RELEASE, somehow MMB didnt
get used by the tweak function so was left at 0 and the modal keymap function
failed when comparing MMB Mouse ups.
now initialize event->val as KM_PRESS/KM_RELEASE
Modified Paths:
--
trunk/blender/source/blender/editors/animation/anim_ops.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/mesh/loopcut.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/animation/anim_ops.c
===
--- trunk/blender/source/blender/editors/animation/anim_ops.c 2009-09-24
10:04:43 UTC (rev 23445)
+++ trunk/blender/source/blender/editors/animation/anim_ops.c 2009-09-24
10:35:04 UTC (rev 23446)
@@ -193,7 +193,7 @@
/* we check for either mouse-button to end, as checking
for ACTIONMOUSE (which is used to init
* the modal op) doesn't work for some reason
*/
- if (event->val==0) {
+ if (event->val==KM_RELEASE) {
change_frame_exit(C, op);
return OPERATOR_FINISHED;
}
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c
2009-09-24 10:04:43 UTC (rev 23445)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c
2009-09-24 10:35:04 UTC (rev 23446)
@@ -2675,7 +2675,7 @@
retval = OPERATOR_CANCELLED;
break;
case LEFTMOUSE:
- if (event->val == 0)
+ if (event->val == KM_RELEASE)
{
if (gesture == 0)
{
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-09-24 10:04:43 UTC (rev 23445)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-09-24 10:35:04 UTC (rev 23446)
@@ -1660,7 +1660,7 @@
break;
}
case LEFTMOUSE:
- if(event->val == 0)
+ if(event->val == KM_RELEASE)
button_activate_state(C, but,
BUTTON_STATE_TEXT_EDITING);
retval= WM_UI_HANDLER_BREAK;
break;
Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===
--- trunk/blender/source/blender/editors/interface/view2d_ops.c 2009-09-24
10:04:43 UTC (rev 23445)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c 2009-09-24
10:35:04 UTC (rev 23446)
@@ -237,7 +237,7 @@
case LEFTMOUSE:
case MIDDLEMOUSE:
- if (event->val==0) {
+ if (event->val==KM_RELEASE) {
/* calculate overall delta mouse-movement for
redo */
RNA_int_set(op->ptr, "deltax", (vpd->startx -
vpd->lastx));
RNA_int_set(op->ptr, "deltay", (vpd->starty -
vpd->lasty));
@@ -836,7 +836,7 @@
case LEFTMOUSE:
case MIDDLEMOUSE:
- if (event->val==0) {
+ if (event->val==KM_RELEASE) {
/* for redo, store the overall deltas - need to
respect zoom-locks here... */
if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0)
RNA_float_set(op->ptr, "deltax",
vzd->dx);
@@ -1244,7 +1244,7 @@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23445] trunk/blender/source/blender/ blenlib/BLI_winstuff.h: Fix more problem with mingw this time
Revision: 23445
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23445
Author: ben2610
Date: 2009-09-24 12:04:43 +0200 (Thu, 24 Sep 2009)
Log Message:
---
Fix more problem with mingw this time
Modified Paths:
--
trunk/blender/source/blender/blenlib/BLI_winstuff.h
Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h
===
--- trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 09:29:59 UTC
(rev 23444)
+++ trunk/blender/source/blender/blenlib/BLI_winstuff.h 2009-09-24 10:04:43 UTC
(rev 23445)
@@ -91,11 +91,14 @@
typedef unsigned int mode_t;
#endif
+#ifndef _SSIZE_T_
+#define _SSIZE_T_
#if defined(_WIN64)
typedef __int64 ssize_t;
#else
typedef _W64 int ssize_t;
#endif
+#endif
struct dirent {
int d_ino;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23444] trunk/blender: Fix compilation problem in Windows and update project files
Revision: 23444 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23444 Author: ben2610 Date: 2009-09-24 11:29:59 +0200 (Thu, 24 Sep 2009) Log Message: --- Fix compilation problem in Windows and update project files Modified Paths: -- trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj trunk/blender/source/blender/blenlib/BLI_winstuff.h trunk/blender/source/blender/blenlib/intern/BLI_bfile.c Modified: trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj === --- trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2009-09-24 07:03:18 UTC (rev 23443) +++ trunk/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2009-09-24 09:29:59 UTC (rev 23444) @@ -483,6 +483,10 @@ > + + @@ -620,6 +624,10 @@ > + + Modified: trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj === --- trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2009-09-24 07:03:18 UTC (rev 23443) +++ trunk/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2009-09-24 09:29:59 UTC (rev 23444) @@ -603,6 +603,10 @@ > + + @@ -683,6 +687,10 @@ > + + @@ -707,6 +715,10 @@ > + + @@ -755,6 +767,10 @@ > + + Modified: trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj === --- trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj 2009-09-24 07:03:18 UTC (rev 23443) +++ trunk/blender/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj 2009-09-24 09:29:59 UTC (rev 23444) @@ -43,7 +43,7 @@ -#include +#ifndef WIN32 + #include +#else + #include +#include "BLI_winstuff.h" +#endif #include #include ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23443] trunk/blender/source/blender: - cmake/make/scons didnt define INTERNATIONAL when buidling blenfont
Revision: 23443
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23443
Author: campbellbarton
Date: 2009-09-24 09:03:18 +0200 (Thu, 24 Sep 2009)
Log Message:
---
- cmake/make/scons didnt define INTERNATIONAL when buidling blenfont
- BLF_lang_init used confusing IFDEF's, unlikely this was well tested. Split
this into 3 functions for Apple/Win32/Unix, Unix uses BLI_gethome_folder(),
cant test others, ideally they should use BLI_gethome_folder too but needs
testing.
Possibly each os cant be made to use BLI_gethome_folder and the separate func's
can be removed (please test).
- units, hectometers were displayed wrong.
Modified Paths:
--
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenfont/Makefile
trunk/blender/source/blender/blenfont/SConscript
trunk/blender/source/blender/blenfont/intern/blf_lang.c
trunk/blender/source/blender/blenkernel/intern/unit.c
Modified: trunk/blender/source/blender/blenfont/CMakeLists.txt
===
--- trunk/blender/source/blender/blenfont/CMakeLists.txt2009-09-24
06:48:03 UTC (rev 23442)
+++ trunk/blender/source/blender/blenfont/CMakeLists.txt2009-09-24
07:03:18 UTC (rev 23443)
@@ -32,6 +32,7 @@
IF(WITH_INTERNATIONAL)
SET(INC ${INC} ${GETTEXT_INC})
+ ADD_DEFINITIONS(-DINTERNATIONAL)
ENDIF(WITH_INTERNATIONAL)
IF(WIN32)
Modified: trunk/blender/source/blender/blenfont/Makefile
===
--- trunk/blender/source/blender/blenfont/Makefile 2009-09-24 06:48:03 UTC
(rev 23442)
+++ trunk/blender/source/blender/blenfont/Makefile 2009-09-24 07:03:18 UTC
(rev 23443)
@@ -28,3 +28,7 @@
DIRS = intern
include nan_subdirs.mk
+
+ifeq ($(INTERNATIONAL), true)
+ CPPFLAGS += -DINTERNATIONAL
+endif
Modified: trunk/blender/source/blender/blenfont/SConscript
===
--- trunk/blender/source/blender/blenfont/SConscript2009-09-24 06:48:03 UTC
(rev 23442)
+++ trunk/blender/source/blender/blenfont/SConscript2009-09-24 07:03:18 UTC
(rev 23443)
@@ -9,9 +9,13 @@
incs += ' ' + env['BF_FREETYPE_INC']
incs += ' ' + env['BF_GETTEXT_INC']
-defs = ''
+defs = []
if sys.platform == 'win32':
- defs += ' _WIN32 USE_GETTEXT_DLL'
+ defs.append('_WIN32')
+ defs.append('USE_GETTEXT_DLL')
+if env['WITH_BF_INTERNATIONAL']:
+defs.append('INTERNATIONAL')
+
env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs),
libtype=['core','player'], priority=[210,210] )
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2009-09-24
06:48:03 UTC (rev 23442)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2009-09-24
07:03:18 UTC (rev 23443)
@@ -60,17 +60,14 @@
char global_language[32];
char global_encoding_name[32];
-
-void BLF_lang_init(void)
+#if defined(__APPLE__)
+void BLF_lang_init(void) /* Apple Only, todo - use BLI_gethome_folder */
{
-#ifdef __APPLE__
char *bundlepath;
-#endif
strcpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT);
/* set messagepath directory */
-
#ifndef LOCALEDIR
#define LOCALEDIR "/usr/share/locale"
#endif
@@ -81,45 +78,53 @@
BLI_make_file_string("/", global_messagepath, BLI_gethome(),
".blender/locale");
if (!BLI_exist(global_messagepath)) { /* locale not in home dir
*/
-#ifdef WIN32
- BLI_make_file_string("/", global_messagepath,
BLI_gethome(), "/locale");
- if (!BLI_exist(global_messagepath)) {
-#endif
-#ifdef __APPLE__
/* message catalogs are stored inside the application
bundle */
bundlepath= BLI_getbundle();
strcpy(global_messagepath, bundlepath);
strcat(global_messagepath,
"/Contents/Resources/locale");
if (!BLI_exist(global_messagepath)) { /* locale not in
bundle (now that's odd..) */
-#endif
strcpy(global_messagepath, LOCALEDIR);
if (!BLI_exist(global_messagepath)) { /* locale
not in LOCALEDIR */
strcpy(global_messagepath, "message");
/* old compatibility as last */
}
-#ifdef WIN32
}
-#endif
-#ifdef __APPLE__
- }
-#endif
}
}
}
+#elif defined(_WIN32)
+void BLF_lang_init(void) /* Windows Only, todo - use BLI_gethome_folder */
+{
+ strcpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT);
+
+ strcpy(global_messagepath, ".blender/locale");
+ if (!BLI_exi
