[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36492] branches/particles-2010: Removed OpenCL dependency.
Revision: 36492
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36492
Author: lukastoenne
Date: 2011-05-05 07:12:19 + (Thu, 05 May 2011)
Log Message:
---
Removed OpenCL dependency. This was left over from simulation nodes, based on
Jeroen Bakker's initial patch, but not in use. Better wait for general OpenCL
support framework.
Modified Paths:
--
branches/particles-2010/CMakeLists.txt
branches/particles-2010/build_files/cmake/macros.cmake
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/nodes/CMakeLists.txt
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_common.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodetree.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/creator.c
Removed Paths:
-
branches/particles-2010/source/blender/blenkernel/BKE_opencl.h
branches/particles-2010/source/blender/blenkernel/intern/opencl.c
Modified: branches/particles-2010/CMakeLists.txt
===
--- branches/particles-2010/CMakeLists.txt 2011-05-04 20:42:34 UTC (rev
36491)
+++ branches/particles-2010/CMakeLists.txt 2011-05-05 07:12:19 UTC (rev
36492)
@@ -110,7 +110,6 @@
option(WITH_IK_ITASC Enable ITASC IK solver (only disable for
development for incompatible C++ compilers) ON)
option(WITH_FFTW3 Enable FFTW3 support (Used for smoke and audio
effects) OFF)
option(WITH_BULLETEnable Bullet (Physics Engine) ON)
-option(WITH_OPENCLEnable OpenCL OFF)
option(WITH_GAMEENGINEEnable Game Engine ON)
option(WITH_PLAYERBuild Player OFF)
# (unix defaults to OpenMP On)
@@ -396,10 +395,6 @@
set(FFTW3_LIBPATH ${FFTW3}/lib)
endif()
- if(WITH_OPENCL)
- set(OPENCL_LIB OpenCL)
- endif(WITH_OPENCL)
-
if(WITH_SAMPLERATE)
set(LIBSAMPLERATE /usr)
set(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
Modified: branches/particles-2010/build_files/cmake/macros.cmake
===
--- branches/particles-2010/build_files/cmake/macros.cmake 2011-05-04
20:42:34 UTC (rev 36491)
+++ branches/particles-2010/build_files/cmake/macros.cmake 2011-05-05
07:12:19 UTC (rev 36492)
@@ -109,9 +109,6 @@
if(WITH_FFTW3)
link_directories(${FFTW3_LIBPATH})
endif()
- if(WITH_OPENCL)
- link_directories(${OPENCL_LIBPATH})
- endif(WITH_OPENCL)
if(WITH_OPENCOLLADA)
link_directories(${OPENCOLLADA_LIBPATH})
link_directories(${PCRE_LIBPATH})
@@ -177,9 +174,6 @@
if(WITH_CODEC_QUICKTIME)
target_link_libraries(${target} ${QUICKTIME_LIB})
endif()
- if(WITH_OPENCL)
- target_link_libraries(${target} ${OPENCL_LIB})
- endif(WITH_OPENCL)
if(WITH_IMAGE_TIFF)
target_link_libraries(${target} ${TIFF_LIBRARY})
endif()
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h
2011-05-04 20:42:34 UTC (rev 36491)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h
2011-05-05 07:12:19 UTC (rev 36492)
@@ -39,8 +39,6 @@
#include DNA_listBase.h
-#include BKE_opencl.h
-
#include RNA_types.h
/* not very important, but the stack solver likes to know a maximum */
Deleted: branches/particles-2010/source/blender/blenkernel/BKE_opencl.h
===
--- branches/particles-2010/source/blender/blenkernel/BKE_opencl.h
2011-05-04 20:42:34 UTC (rev 36491)
+++ branches/particles-2010/source/blender/blenkernel/BKE_opencl.h
2011-05-05 07:12:19 UTC (rev 36492)
@@ -1,65 +0,0 @@
-#ifndef BKE_OPENCL_H
-#define BKE_OPENCL_H
-
-#ifdef WITH_OPENCL
-
-#if defined(__APPLE__) || defined(__MACOSX)
-#include OpenCL/opencl.h
-#else
-#include CL/opencl.h
-#endif
-
-int BKE_opencl_init(void);
-void BKE_opencl_deinit(void);
-
-/**
- * BKE_opencl_is_enabled: returns if the opencl system is enabled
- * 0: System is disabled
- * 1: System is enabled
- */
-int BKE_opencl_is_enabled(void);
-
-/**
- * BKE_opencl_is_active: returns true is the state of opencl is usable
- */
-int BKE_opencl_is_active(void);
-
-/**
- * Translate an opencl result code to a readable message
- */
-char *BKE_opencl_message(cl_int err);
-
-cl_context BKE_opencl_preferred_context(void);
-cl_device_id
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36493] branches/particles-2010: svn merge -r36339:36492 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 36493 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36493 Author: lukastoenne Date: 2011-05-05 07:47:34 + (Thu, 05 May 2011) Log Message: --- svn merge -r36339:36492 https://svn.blender.org/svnroot/bf-blender/trunk/blender Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36339 Modified Paths: -- branches/particles-2010/CMakeLists.txt branches/particles-2010/build_files/buildbot/config/user-config-i686.py branches/particles-2010/build_files/buildbot/config/user-config-x86_64.py branches/particles-2010/build_files/package_spec/debian/menu branches/particles-2010/build_files/scons/tools/btools.py branches/particles-2010/doc/python_api/examples/bpy.types.Operator.1.py branches/particles-2010/extern/CMakeLists.txt branches/particles-2010/extern/SConscript branches/particles-2010/intern/ghost/GHOST_C-api.h branches/particles-2010/intern/ghost/GHOST_ISystem.h branches/particles-2010/intern/ghost/intern/GHOST_C-api.cpp branches/particles-2010/intern/ghost/intern/GHOST_Debug.h branches/particles-2010/intern/ghost/intern/GHOST_SystemCarbon.h branches/particles-2010/intern/ghost/intern/GHOST_SystemCocoa.h branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.h branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.cpp branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.h branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.cpp branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.h branches/particles-2010/intern/ghost/test/gears/GHOST_C-Test.c branches/particles-2010/intern/guardedalloc/MEM_sys_types.h branches/particles-2010/intern/opennl/superlu/superlu_sys_types.h branches/particles-2010/release/scripts/modules/bpy/utils.py branches/particles-2010/release/scripts/presets/interaction/blender.py branches/particles-2010/release/scripts/presets/interaction/maya.py branches/particles-2010/release/scripts/startup/bl_operators/mesh.py branches/particles-2010/release/scripts/startup/bl_operators/presets.py branches/particles-2010/release/scripts/startup/bl_operators/wm.py branches/particles-2010/release/scripts/startup/bl_ui/properties_data_modifier.py branches/particles-2010/release/scripts/startup/bl_ui/properties_game.py branches/particles-2010/release/scripts/startup/bl_ui/properties_material.py branches/particles-2010/release/scripts/startup/bl_ui/properties_physics_cloth.py branches/particles-2010/release/scripts/startup/bl_ui/properties_texture.py branches/particles-2010/release/scripts/startup/bl_ui/space_image.py branches/particles-2010/release/scripts/startup/bl_ui/space_userpref.py branches/particles-2010/release/scripts/startup/bl_ui/space_userpref_keymap.py branches/particles-2010/release/scripts/startup/bl_ui/space_view3d.py branches/particles-2010/release/scripts/startup/bl_ui/space_view3d_toolbar.py branches/particles-2010/release/scripts/templates/operator_export.py branches/particles-2010/source/blender/blenfont/BLF_api.h branches/particles-2010/source/blender/blenfont/intern/blf.c branches/particles-2010/source/blender/blenfont/intern/blf_font.c branches/particles-2010/source/blender/blenfont/intern/blf_internal_types.h branches/particles-2010/source/blender/blenkernel/BKE_cloth.h branches/particles-2010/source/blender/blenkernel/BKE_collision.h branches/particles-2010/source/blender/blenkernel/BKE_image.h branches/particles-2010/source/blender/blenkernel/BKE_sequencer.h branches/particles-2010/source/blender/blenkernel/BKE_shrinkwrap.h branches/particles-2010/source/blender/blenkernel/CMakeLists.txt branches/particles-2010/source/blender/blenkernel/SConscript branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.c branches/particles-2010/source/blender/blenkernel/intern/action.c branches/particles-2010/source/blender/blenkernel/intern/anim_sys.c branches/particles-2010/source/blender/blenkernel/intern/blender.c branches/particles-2010/source/blender/blenkernel/intern/cdderivedmesh.c branches/particles-2010/source/blender/blenkernel/intern/cloth.c branches/particles-2010/source/blender/blenkernel/intern/collision.c branches/particles-2010/source/blender/blenkernel/intern/constraint.c branches/particles-2010/source/blender/blenkernel/intern/context.c branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c branches/particles-2010/source/blender/blenkernel/intern/font.c branches/particles-2010/source/blender/blenkernel/intern/idprop.c branches/particles-2010/source/blender/blenkernel/intern/image.c branches/particles-2010/source/blender/blenkernel/intern/implicit.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36494] branches/particles-2010/source/ blender/nodes/SConscript: Fix for scons build files.
Revision: 36494 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36494 Author: lukastoenne Date: 2011-05-05 08:36:14 + (Thu, 05 May 2011) Log Message: --- Fix for scons build files. Modified Paths: -- branches/particles-2010/source/blender/nodes/SConscript Modified: branches/particles-2010/source/blender/nodes/SConscript === --- branches/particles-2010/source/blender/nodes/SConscript 2011-05-05 07:47:34 UTC (rev 36493) +++ branches/particles-2010/source/blender/nodes/SConscript 2011-05-05 08:36:14 UTC (rev 36494) @@ -38,5 +38,3 @@ env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) -env.BlenderLib ( libname = 'bf_modnodes', sources = modsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) -#env.BlenderLib ( libname = 'bf_parnodes', sources = parsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) ___ 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 [36495] branches/cycles/source: Cycles refactoring: put external engine code into separate file.
Revision: 36495
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36495
Author: blendix
Date: 2011-05-05 09:43:45 + (Thu, 05 May 2011)
Log Message:
---
Cycles refactoring: put external engine code into separate file.
Modified Paths:
--
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/editors/render/render_shading.c
branches/cycles/source/blender/editors/space_view3d/space_view3d.c
branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
branches/cycles/source/blender/makesrna/intern/rna_render.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/render/CMakeLists.txt
branches/cycles/source/blender/render/SConscript
branches/cycles/source/blender/render/extern/include/RE_pipeline.h
branches/cycles/source/blender/render/intern/include/renderpipeline.h
branches/cycles/source/blender/windowmanager/intern/wm_draw.c
branches/cycles/source/blender/windowmanager/intern/wm_init_exit.c
branches/cycles/source/creator/creator.c
Added Paths:
---
branches/cycles/source/blender/render/extern/include/RE_engine.h
branches/cycles/source/blender/render/intern/pipeline/
branches/cycles/source/blender/render/intern/pipeline/engine.c
branches/cycles/source/blender/render/intern/source/pipeline.c
Removed Paths:
-
branches/cycles/source/blender/render/intern/source/pipeline.c
Modified: branches/cycles/source/blender/blenloader/intern/readfile.c
===
--- branches/cycles/source/blender/blenloader/intern/readfile.c 2011-05-05
08:36:14 UTC (rev 36494)
+++ branches/cycles/source/blender/blenloader/intern/readfile.c 2011-05-05
09:43:45 UTC (rev 36495)
@@ -139,7 +139,7 @@
#include BLO_undofile.h
#include BLO_readblenfile.h // streaming read pipe, for BLO_readblenfile
BLO_readblenfilememory
-#include RE_pipeline.h
+#include RE_engine.h
#include readfile.h
Modified: branches/cycles/source/blender/editors/render/render_shading.c
===
--- branches/cycles/source/blender/editors/render/render_shading.c
2011-05-05 08:36:14 UTC (rev 36494)
+++ branches/cycles/source/blender/editors/render/render_shading.c
2011-05-05 09:43:45 UTC (rev 36495)
@@ -238,7 +238,7 @@
#include DNA_screen_types.h
#include DNA_view3d_types.h
-#include RE_pipeline.h
+#include RE_engine.h
static void update_render_engines(Main *bmain, int tagged_only)
{
Modified: branches/cycles/source/blender/editors/space_view3d/space_view3d.c
===
--- branches/cycles/source/blender/editors/space_view3d/space_view3d.c
2011-05-05 08:36:14 UTC (rev 36494)
+++ branches/cycles/source/blender/editors/space_view3d/space_view3d.c
2011-05-05 09:43:45 UTC (rev 36495)
@@ -58,7 +58,7 @@
#include WM_api.h
#include WM_types.h
-#include RE_pipeline.h
+#include RE_engine.h
#include RNA_access.h
Modified: branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
===
--- branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
2011-05-05 08:36:14 UTC (rev 36494)
+++ branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
2011-05-05 09:43:45 UTC (rev 36495)
@@ -63,6 +63,7 @@
#include BKE_scene.h
#include BKE_unit.h
+#include RE_engine.h
#include RE_pipeline.h // make_stars
#include IMB_imbuf_types.h
Modified: branches/cycles/source/blender/makesrna/intern/rna_render.c
===
--- branches/cycles/source/blender/makesrna/intern/rna_render.c 2011-05-05
08:36:14 UTC (rev 36494)
+++ branches/cycles/source/blender/makesrna/intern/rna_render.c 2011-05-05
09:43:45 UTC (rev 36495)
@@ -35,6 +35,7 @@
#include rna_internal.h
+#include RE_engine.h
#include RE_pipeline.h
#include BKE_utildefines.h
Modified: branches/cycles/source/blender/makesrna/intern/rna_scene.c
===
--- branches/cycles/source/blender/makesrna/intern/rna_scene.c 2011-05-05
08:36:14 UTC (rev 36494)
+++ branches/cycles/source/blender/makesrna/intern/rna_scene.c 2011-05-05
09:43:45 UTC (rev 36495)
@@ -41,6 +41,7 @@
#include DNA_userdef_types.h
/* Include for Bake Options */
+#include RE_engine.h
#include RE_pipeline.h
#ifdef WITH_QUICKTIME
Modified: branches/cycles/source/blender/render/CMakeLists.txt
===
--- branches/cycles/source/blender/render/CMakeLists.txt2011-05-05
08:36:14 UTC (rev 36494)
+++ branches/cycles/source/blender/render/CMakeLists.txt2011-05-05
09:43:45 UTC (rev 36495)
@@ -77,7 +77,9 @@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36496] branches/particles-2010/source/ blender: Fixed memory bug when copying node trees, group tree sockets did not duplicate their default button v
Revision: 36496
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36496
Author: lukastoenne
Date: 2011-05-05 10:03:54 + (Thu, 05 May 2011)
Log Message:
---
Fixed memory bug when copying node trees, group tree sockets did not duplicate
their default button values.
Added correct cloning of socket default values when exposing a group socket.
Added simple conversion of socket default values when ungrouping a group (this
will be part of a more sophisticated converter system in the future).
Modified Paths:
--
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/nodes/intern/node_common.c
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===
--- branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-05 09:43:45 UTC (rev 36495)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-05 10:03:54 UTC (rev 36496)
@@ -579,8 +579,7 @@
oldsock-new_sock= sock;
sock-stack_index= 0;
- if (sock-default_value)
- sock-default_value =
MEM_dupallocN(sock-default_value);
+ sock-default_value = (oldsock-default_value ?
MEM_dupallocN(oldsock-default_value) : NULL);
if (sock-panel)
sock-panel = sock-panel-new_panel;
@@ -592,8 +591,7 @@
oldsock-new_sock= sock;
sock-stack_index= 0;
- if (sock-default_value)
- sock-default_value =
MEM_dupallocN(sock-default_value);
+ sock-default_value = (oldsock-default_value ?
MEM_dupallocN(oldsock-default_value) : NULL);
if (sock-panel)
sock-panel = sock-panel-new_panel;
@@ -841,11 +839,13 @@
for(gsock= newtree-inputs.first, oldgsock= ntree-inputs.first; gsock;
gsock=gsock-next, oldgsock=oldgsock-next) {
oldgsock-new_sock= gsock;
gsock-groupsock = (oldgsock-groupsock ?
oldgsock-groupsock-new_sock : NULL);
+ gsock-default_value = (oldgsock-default_value ?
MEM_dupallocN(oldgsock-default_value) : NULL);
}
BLI_duplicatelist(newtree-outputs, ntree-outputs);
for(gsock= newtree-outputs.first, oldgsock= ntree-outputs.first;
gsock; gsock=gsock-next, oldgsock=oldgsock-next) {
oldgsock-new_sock= gsock;
gsock-groupsock = (oldgsock-groupsock ?
oldgsock-groupsock-new_sock : NULL);
+ gsock-default_value = (oldgsock-default_value ?
MEM_dupallocN(oldgsock-default_value) : NULL);
}
/* copy links */
Modified: branches/particles-2010/source/blender/nodes/intern/node_common.c
===
--- branches/particles-2010/source/blender/nodes/intern/node_common.c
2011-05-05 09:43:45 UTC (rev 36495)
+++ branches/particles-2010/source/blender/nodes/intern/node_common.c
2011-05-05 10:03:54 UTC (rev 36496)
@@ -235,6 +235,184 @@
return gnode;
}
+/* XXX This is a makeshift function to have useful initial group socket values.
+ * In the end this should be implemented by a flexible socket data conversion
system,
+ * which is yet to be implemented. The idea is that beside default standard
conversions,
+ * such as int-to-float, it should be possible to quickly select a conversion
method or
+ * a chain of conversions for each input, whenever there is more than one
option.
+ * E.g. a vector-to-float conversion could use either of the x/y/z components
or
+ * the vector length.
+ *
+ * In the interface this could be implemented by a pseudo-script textbox on
linked inputs,
+ * with quick selection from a predefined list of conversion options. Some
Examples:
+ * - vector component 'z' (vector-float):
z
+ * - greyscale color (float-color):
grey
+ * - color luminance (color-float):
lum
+ * - matrix column 2 length (matrix-vector-float):
col[1].len
+ * - mesh vertex coordinate 'y' (mesh-vertex-vector-float): vertex.co.y
+ *
+ * The actual conversion is then done by a series of conversion functions,
+ * which are defined in the socket type structs.
+ */
+static void convert_socket_value(bNodeSocket *from, bNodeSocket *to)
+{
+ /* XXX only one of these pointers is valid! just putting them here for
convenience */
+ bNodeSocketValueFloat *fromfloat=
(bNodeSocketValueFloat*)from-default_value;
+ bNodeSocketValueInt *fromint= (bNodeSocketValueInt*)from-default_value;
+ bNodeSocketValueBoolean *frombool=
(bNodeSocketValueBoolean*)from-default_value;
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36497] branches/cycles: Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/ blender/
Revision: 36497 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36497 Author: blendix Date: 2011-05-05 10:14:56 + (Thu, 05 May 2011) Log Message: --- Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36352 Modified Paths: -- branches/cycles/CMakeLists.txt branches/cycles/build_files/buildbot/config/user-config-i686.py branches/cycles/build_files/buildbot/config/user-config-x86_64.py branches/cycles/build_files/package_spec/debian/menu branches/cycles/build_files/scons/tools/btools.py branches/cycles/doc/python_api/examples/bpy.types.Operator.1.py branches/cycles/extern/CMakeLists.txt branches/cycles/extern/SConscript branches/cycles/intern/ghost/GHOST_C-api.h branches/cycles/intern/ghost/GHOST_ISystem.h branches/cycles/intern/ghost/intern/GHOST_C-api.cpp branches/cycles/intern/ghost/intern/GHOST_Debug.h branches/cycles/intern/ghost/intern/GHOST_SystemCarbon.h branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.h branches/cycles/intern/ghost/intern/GHOST_SystemWin32.cpp branches/cycles/intern/ghost/intern/GHOST_SystemWin32.h branches/cycles/intern/ghost/intern/GHOST_SystemX11.cpp branches/cycles/intern/ghost/intern/GHOST_SystemX11.h branches/cycles/intern/ghost/intern/GHOST_WindowWin32.cpp branches/cycles/intern/ghost/intern/GHOST_WindowWin32.h branches/cycles/intern/ghost/test/gears/GHOST_C-Test.c branches/cycles/intern/guardedalloc/MEM_sys_types.h branches/cycles/intern/opennl/superlu/superlu_sys_types.h branches/cycles/release/scripts/modules/bpy/utils.py branches/cycles/release/scripts/presets/interaction/blender.py branches/cycles/release/scripts/presets/interaction/maya.py branches/cycles/release/scripts/startup/bl_operators/mesh.py branches/cycles/release/scripts/startup/bl_operators/presets.py branches/cycles/release/scripts/startup/bl_operators/wm.py branches/cycles/release/scripts/startup/bl_ui/properties_data_modifier.py branches/cycles/release/scripts/startup/bl_ui/properties_game.py branches/cycles/release/scripts/startup/bl_ui/properties_material.py branches/cycles/release/scripts/startup/bl_ui/properties_physics_cloth.py branches/cycles/release/scripts/startup/bl_ui/properties_texture.py branches/cycles/release/scripts/startup/bl_ui/space_image.py branches/cycles/release/scripts/startup/bl_ui/space_userpref.py branches/cycles/release/scripts/startup/bl_ui/space_userpref_keymap.py branches/cycles/release/scripts/startup/bl_ui/space_view3d.py branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py branches/cycles/release/scripts/templates/operator_export.py branches/cycles/source/blender/blenfont/BLF_api.h branches/cycles/source/blender/blenfont/intern/blf.c branches/cycles/source/blender/blenfont/intern/blf_font.c branches/cycles/source/blender/blenfont/intern/blf_internal_types.h branches/cycles/source/blender/blenkernel/BKE_cloth.h branches/cycles/source/blender/blenkernel/BKE_collision.h branches/cycles/source/blender/blenkernel/BKE_image.h branches/cycles/source/blender/blenkernel/BKE_sequencer.h branches/cycles/source/blender/blenkernel/BKE_shrinkwrap.h branches/cycles/source/blender/blenkernel/CMakeLists.txt branches/cycles/source/blender/blenkernel/SConscript branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c branches/cycles/source/blender/blenkernel/intern/action.c branches/cycles/source/blender/blenkernel/intern/blender.c branches/cycles/source/blender/blenkernel/intern/cdderivedmesh.c branches/cycles/source/blender/blenkernel/intern/cloth.c branches/cycles/source/blender/blenkernel/intern/collision.c branches/cycles/source/blender/blenkernel/intern/constraint.c branches/cycles/source/blender/blenkernel/intern/context.c branches/cycles/source/blender/blenkernel/intern/depsgraph.c branches/cycles/source/blender/blenkernel/intern/font.c branches/cycles/source/blender/blenkernel/intern/idprop.c branches/cycles/source/blender/blenkernel/intern/image.c branches/cycles/source/blender/blenkernel/intern/implicit.c branches/cycles/source/blender/blenkernel/intern/library.c branches/cycles/source/blender/blenkernel/intern/node.c branches/cycles/source/blender/blenkernel/intern/object.c branches/cycles/source/blender/blenkernel/intern/particle.c branches/cycles/source/blender/blenkernel/intern/pointcache.c branches/cycles/source/blender/blenkernel/intern/sequencer.c branches/cycles/source/blender/blenkernel/intern/subsurf_ccg.c branches/cycles/source/blender/blenkernel/intern/texture.c branches/cycles/source/blender/blenlib/BLI_listbase.h
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36498] branches/cycles/source/blender/ modifiers/intern/MOD_warp.c: Cycles merge: add missing file.
Revision: 36498
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36498
Author: blendix
Date: 2011-05-05 10:36:43 + (Thu, 05 May 2011)
Log Message:
---
Cycles merge: add missing file.
Added Paths:
---
branches/cycles/source/blender/modifiers/intern/MOD_warp.c
Added: branches/cycles/source/blender/modifiers/intern/MOD_warp.c
===
--- branches/cycles/source/blender/modifiers/intern/MOD_warp.c
(rev 0)
+++ branches/cycles/source/blender/modifiers/intern/MOD_warp.c 2011-05-05
10:36:43 UTC (rev 36498)
@@ -0,0 +1,365 @@
+/*
+* $Id: MOD_warp.c 36420 2011-05-01 23:16:16Z gsrb3d $
+*
+* * BEGIN GPL LICENSE BLOCK *
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+* Contributor(s): Campbell Barton
+*
+* * END GPL LICENSE BLOCK *
+*
+*/
+
+#include string.h
+
+#include MEM_guardedalloc.h
+
+#include BLI_math.h
+#include BLI_utildefines.h
+
+#include BKE_cdderivedmesh.h
+#include BKE_modifier.h
+#include BKE_deform.h
+#include BKE_texture.h
+#include BKE_colortools.h
+
+#include DNA_object_types.h
+#include DNA_meshdata_types.h
+
+#include depsgraph_private.h
+
+#include RE_shader_ext.h
+
+#include MOD_util.h
+
+
+static void initData(ModifierData *md)
+{
+ WarpModifierData *wmd = (WarpModifierData*) md;
+
+ wmd-curfalloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ wmd-texture = NULL;
+ wmd-strength = 1.0f;
+ wmd-falloff_radius = 1.0f;
+ wmd-falloff_type = eWarp_Falloff_Smooth;
+ wmd-flag = 0;
+}
+
+static void copyData(ModifierData *md, ModifierData *target)
+{
+ WarpModifierData *wmd = (WarpModifierData*) md;
+ WarpModifierData *twmd = (WarpModifierData*) target;
+
+ twmd-object_from = wmd-object_from;
+ twmd-object_to = wmd-object_to;
+
+ twmd-strength = wmd-strength;
+ twmd-falloff_radius = wmd-falloff_radius;
+ twmd-falloff_type = wmd-falloff_type;
+ strncpy(twmd-defgrp_name, wmd-defgrp_name, sizeof(twmd-defgrp_name));
+ twmd-curfalloff = curvemapping_copy(wmd-curfalloff);
+
+ /* map info */
+ twmd-texture = wmd-texture;
+ twmd-map_object = wmd-map_object;
+ strncpy(twmd-uvlayer_name, wmd-uvlayer_name,
sizeof(twmd-uvlayer_name));
+ twmd-texmapping= wmd-texmapping;
+}
+
+static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
+{
+ WarpModifierData *wmd = (WarpModifierData *)md;
+ CustomDataMask dataMask = 0;
+
+ /* ask for vertexgroups if we need them */
+ if(wmd-defgrp_name[0]) dataMask |= (1 CD_MDEFORMVERT);
+ dataMask |= (1 CD_MDEFORMVERT);
+
+ /* ask for UV coordinates if we need them */
+ if(wmd-texmapping == MOD_DISP_MAP_UV) dataMask |= (1 CD_MTFACE);
+
+ return dataMask;
+}
+
+static int dependsOnTime(ModifierData *md)
+{
+ WarpModifierData *wmd = (WarpModifierData *)md;
+
+ if(wmd-texture) {
+ return BKE_texture_dependsOnTime(wmd-texture);
+ }
+ else {
+ return 0;
+ }
+}
+
+static void freeData(ModifierData *md)
+{
+ WarpModifierData *wmd = (WarpModifierData *) md;
+ curvemapping_free(wmd-curfalloff);
+}
+
+
+static int isDisabled(ModifierData *md, int UNUSED(userRenderParams))
+{
+ WarpModifierData *wmd = (WarpModifierData*) md;
+
+ return !(wmd-object_from wmd-object_to);
+}
+
+static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc
walk, void *userData)
+{
+ WarpModifierData *wmd = (WarpModifierData*) md;
+
+ walk(userData, ob, wmd-object_from);
+ walk(userData, ob, wmd-object_to);
+ walk(userData, ob, wmd-map_object);
+}
+
+static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void
*userData)
+{
+ WarpModifierData *wmd = (WarpModifierData*) md;
+
+ walk(userData, ob, (ID **)wmd-texture);
+
+ walk(userData, ob, (ID **)wmd-object_from);
+ walk(userData, ob, (ID **)wmd-object_to);
+ walk(userData, ob, (ID **)wmd-map_object);
+}
+
+static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene
*UNUSED(scene),
+ Object *UNUSED(ob), DagNode *obNode)
+{
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36499] branches/particles-2010/source/ blender: do_versions for node socket default values.
Revision: 36499
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36499
Author: lukastoenne
Date: 2011-05-05 13:29:16 + (Thu, 05 May 2011)
Log Message:
---
do_versions for node socket default values. These are now stored in a custom
struct for each type and need to be converted from the bNodeStack data.
Modified Paths:
--
branches/particles-2010/source/blender/blenloader/CMakeLists.txt
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
Modified: branches/particles-2010/source/blender/blenloader/CMakeLists.txt
===
--- branches/particles-2010/source/blender/blenloader/CMakeLists.txt
2011-05-05 10:36:43 UTC (rev 36498)
+++ branches/particles-2010/source/blender/blenloader/CMakeLists.txt
2011-05-05 13:29:16 UTC (rev 36499)
@@ -31,6 +31,7 @@
../makesdna
../readblenfile
../makesrna
+ ../nodes
../render/extern/include
../../../intern/guardedalloc
${ZLIB_INCLUDE_DIRS}
Modified: branches/particles-2010/source/blender/blenloader/intern/readfile.c
===
--- branches/particles-2010/source/blender/blenloader/intern/readfile.c
2011-05-05 10:36:43 UTC (rev 36498)
+++ branches/particles-2010/source/blender/blenloader/intern/readfile.c
2011-05-05 13:29:16 UTC (rev 36499)
@@ -142,6 +142,8 @@
#include RNA_access.h
#include RNA_types.h
+#include intern/node_socket.h
+
#include readfile.h
#include PIL_time.h
@@ -6887,6 +6889,50 @@
do_version_bone_roll_256(child);
}
+static void do_versions_socket_default_value(bNodeSocket *sock)
+{
+ bNodeSocketValueFloat *valfloat;
+ bNodeSocketValueVector *valvector;
+ bNodeSocketValueRGBA *valrgba;
+
+ switch (sock-type) {
+ case SOCK_VALUE:
+ valfloat = sock-default_value =
MEM_callocN(sizeof(bNodeSocketValueFloat), default socket value);
+ valfloat-value = sock-ns.vec[0];
+ valfloat-min = sock-ns.min;
+ valfloat-max = sock-ns.max;
+ valfloat-subtype = PROP_NONE;
+ break;
+ case SOCK_VECTOR:
+ valvector = sock-default_value =
MEM_callocN(sizeof(bNodeSocketValueVector), default socket value);
+ copy_v3_v3(valvector-value, sock-ns.vec);
+ valvector-min = sock-ns.min;
+ valvector-max = sock-ns.max;
+ valvector-subtype = PROP_NONE;
+ break;
+ case SOCK_RGBA:
+ valrgba = sock-default_value =
MEM_callocN(sizeof(bNodeSocketValueRGBA), default socket value);
+ copy_v4_v4(valrgba-value, sock-ns.vec);
+ break;
+ }
+}
+
+static void do_versions_nodetree_default_value(bNodeTree *ntree)
+{
+ bNode *node;
+ bNodeSocket *sock;
+ for (node=ntree-nodes.first; node; node=node-next) {
+ for (sock=node-inputs.first; sock; sock=sock-next)
+ do_versions_socket_default_value(sock);
+ for (sock=node-outputs.first; sock; sock=sock-next)
+ do_versions_socket_default_value(sock);
+ }
+ for (sock=ntree-inputs.first; sock; sock=sock-next)
+ do_versions_socket_default_value(sock);
+ for (sock=ntree-outputs.first; sock; sock=sock-next)
+ do_versions_socket_default_value(sock);
+}
+
static void do_versions(FileData *fd, Library *lib, Main *main)
{
/* WATCH IT!!!: pointers from libdata have not been converted */
@@ -11688,6 +11734,25 @@
}
}
+ {
+ /* Convert default socket values from bNodeStack */
+ Scene *sce;
+ Material *mat;
+ Tex *tex;
+ bNodeTree *ntree;
+ for (ntree=main-nodetree.first; ntree; ntree=ntree-id.next)
+ do_versions_nodetree_default_value(ntree);
+ for (sce=main-scene.first; sce; sce=sce-id.next)
+ if (sce-nodetree)
+
do_versions_nodetree_default_value(sce-nodetree);
+ for (mat=main-mat.first; mat; mat=mat-id.next)
+ if (mat-nodetree)
+
do_versions_nodetree_default_value(mat-nodetree);
+ for (tex=main-tex.first; tex; tex=tex-id.next)
+ if (tex-nodetree)
+
do_versions_nodetree_default_value(tex-nodetree);
+ }
+
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
/* WATCH IT 2!: Userdef struct init has to be in
editors/interface/resources.c! */
Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36500] branches/cycles/intern/cycles: Cycles: two 32 bit fixes with help from IRC user Agiofws.
Revision: 36500
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36500
Author: blendix
Date: 2011-05-05 13:51:33 + (Thu, 05 May 2011)
Log Message:
---
Cycles: two 32 bit fixes with help from IRC user Agiofws.
Modified Paths:
--
branches/cycles/intern/cycles/blender/blender_python.cpp
branches/cycles/intern/cycles/util/util_system.cpp
Modified: branches/cycles/intern/cycles/blender/blender_python.cpp
===
--- branches/cycles/intern/cycles/blender/blender_python.cpp2011-05-05
13:29:16 UTC (rev 36499)
+++ branches/cycles/intern/cycles/blender/blender_python.cpp2011-05-05
13:51:33 UTC (rev 36500)
@@ -41,34 +41,34 @@
static PyObject *create_func(PyObject *self, PyObject *args)
{
- Py_ssize_t pyengine, pydata, pyscene, pyregion, pyv3d, pyrv3d;
+ PyObject *pyengine, *pydata, *pyscene, *pyregion, *pyv3d, *pyrv3d;
- if(!PyArg_ParseTuple(args, nn, pyengine, pydata, pyscene,
pyregion, pyv3d, pyrv3d))
+ if(!PyArg_ParseTuple(args, OO, pyengine, pydata, pyscene,
pyregion, pyv3d, pyrv3d))
return NULL;
/* RNA */
PointerRNA engineptr;
- RNA_pointer_create(NULL, RNA_RenderEngine, (void*)pyengine,
engineptr);
+ RNA_pointer_create(NULL, RNA_RenderEngine,
(void*)PyLong_AsVoidPtr(pyengine), engineptr);
BL::RenderEngine engine(engineptr);
PointerRNA dataptr;
- RNA_id_pointer_create((ID*)pydata, dataptr);
+ RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pydata), dataptr);
BL::BlendData data(dataptr);
PointerRNA sceneptr;
- RNA_id_pointer_create((ID*)pyscene, sceneptr);
+ RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyscene), sceneptr);
BL::Scene scene(sceneptr);
PointerRNA regionptr;
- RNA_id_pointer_create((ID*)pyregion, regionptr);
+ RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyregion), regionptr);
BL::Region region(regionptr);
PointerRNA v3dptr;
- RNA_id_pointer_create((ID*)pyv3d, v3dptr);
+ RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyv3d), v3dptr);
BL::SpaceView3D v3d(v3dptr);
PointerRNA rv3dptr;
- RNA_id_pointer_create((ID*)pyrv3d, rv3dptr);
+ RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pyrv3d), rv3dptr);
BL::RegionView3D rv3d(rv3dptr);
/* create session */
@@ -91,12 +91,12 @@
static PyObject *free_func(PyObject *self, PyObject *args)
{
- Py_ssize_t pysession;
+ PyObject *pysession;
- if(!PyArg_ParseTuple(args, n, pysession))
+ if(!PyArg_ParseTuple(args, O, pysession))
return NULL;
- delete (BlenderSession*)pysession;
+ delete (BlenderSession*)PyLong_AsVoidPtr(pysession);
Py_INCREF(Py_None);
return Py_None;
@@ -104,14 +104,14 @@
static PyObject *render_func(PyObject *self, PyObject *args)
{
- Py_ssize_t pysession;
+ PyObject *pysession;
- if(!PyArg_ParseTuple(args, n, pysession))
+ if(!PyArg_ParseTuple(args, O, pysession))
return NULL;
Py_BEGIN_ALLOW_THREADS
- BlenderSession *session = (BlenderSession*)pysession;
+ BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
session-render();
Py_END_ALLOW_THREADS
@@ -122,16 +122,16 @@
static PyObject *draw_func(PyObject *self, PyObject *args)
{
- Py_ssize_t pysession, pyv3d, pyrv3d;
+ PyObject *pysession, *pyv3d, *pyrv3d;
- if(!PyArg_ParseTuple(args, nnn, pysession, pyv3d, pyrv3d))
+ if(!PyArg_ParseTuple(args, OOO, pysession, pyv3d, pyrv3d))
return NULL;
- BlenderSession *session = (BlenderSession*)pysession;
+ BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
bool draw_text = false;
- if(pyrv3d) {
+ if(PyLong_AsVoidPtr(pyrv3d)) {
/* 3d view drawing */
int viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
@@ -164,12 +164,12 @@
static PyObject *sync_func(PyObject *self, PyObject *args)
{
- Py_ssize_t pysession;
+ PyObject *pysession;
- if(!PyArg_ParseTuple(args, n, pysession))
+ if(!PyArg_ParseTuple(args, O, pysession))
return NULL;
- BlenderSession *session = (BlenderSession*)pysession;
+ BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
session-synchronize();
Py_INCREF(Py_None);
Modified: branches/cycles/intern/cycles/util/util_system.cpp
===
--- branches/cycles/intern/cycles/util/util_system.cpp 2011-05-05 13:29:16 UTC
(rev 36499)
+++ branches/cycles/intern/cycles/util/util_system.cpp 2011-05-05 13:51:33 UTC
(rev 36500)
@@ -60,7 +60,18 @@
#ifndef _WIN32
static void
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36501] trunk/blender/source/blender: remove exotic.c, there was no operators to access these formats and they were not well maintained .
Revision: 36501 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36501 Author: campbellbarton Date: 2011-05-05 14:21:31 + (Thu, 05 May 2011) Log Message: --- remove exotic.c, there was no operators to access these formats and they were not well maintained. Modified Paths: -- trunk/blender/source/blender/blenkernel/CMakeLists.txt trunk/blender/source/blender/windowmanager/intern/wm_files.c Removed Paths: - trunk/blender/source/blender/blenkernel/BKE_exotic.h trunk/blender/source/blender/blenkernel/intern/exotic.c Deleted: trunk/blender/source/blender/blenkernel/BKE_exotic.h === --- trunk/blender/source/blender/blenkernel/BKE_exotic.h2011-05-05 13:51:33 UTC (rev 36500) +++ trunk/blender/source/blender/blenkernel/BKE_exotic.h2011-05-05 14:21:31 UTC (rev 36501) @@ -1,60 +0,0 @@ -/* - * $Id$ - * - * * BEGIN GPL LICENSE BLOCK * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * * END GPL LICENSE BLOCK * - */ - -#ifndef BKE_EXOTIC_H -#define BKE_EXOTIC_H - -/** \file BKE_exotic.h - * \ingroup bke - * \brief dxf/vrml/stl external file io function prototypes. - * \attention is this used still? Candidate for removal? - */ -struct Mesh; -struct Scene; - -/** - * Reads all 3D fileformats other than Blender fileformat - * @retval 0 The file could not be read. - * @retval 1 The file was read succesfully. - * @attention Used in filesel.c - */ -int BKE_read_exotic(struct Scene *scene, const char *name); - -/* return codes */ -#define BKE_READ_EXOTIC_FAIL_PATH -3 /* file format is not supported */ -#define BKE_READ_EXOTIC_FAIL_FORMAT-2 /* file format is not supported */ -#define BKE_READ_EXOTIC_FAIL_OPEN -1 /* Can't open the file */ -#define BKE_READ_EXOTIC_OK_BLEND0 /* .blend file */ -#define BKE_READ_EXOTIC_OK_OTHER1 /* other supported formats */ - -void write_dxf(struct Scene *scene, char *str); -void write_stl(struct Scene *scene, char *str); - -#endif - Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt === --- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-05 13:51:33 UTC (rev 36500) +++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-05 14:21:31 UTC (rev 36501) @@ -91,7 +91,6 @@ intern/depsgraph.c intern/displist.c intern/effect.c - intern/exotic.c intern/fcurve.c intern/fluidsim.c intern/fmodifier.c @@ -176,7 +175,6 @@ BKE_displist.h BKE_effect.h BKE_endian.h - BKE_exotic.h BKE_fcurve.h BKE_fluidsim.h BKE_font.h Deleted: trunk/blender/source/blender/blenkernel/intern/exotic.c === --- trunk/blender/source/blender/blenkernel/intern/exotic.c 2011-05-05 13:51:33 UTC (rev 36500) +++ trunk/blender/source/blender/blenkernel/intern/exotic.c 2011-05-05 14:21:31 UTC (rev 36501) @@ -1,2485 +0,0 @@ -/* - * $Id$ - * - * * BEGIN GPL LICENSE BLOCK * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * - * Contributor(s): - * -
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36502] trunk/blender: sphinx api docs: fix for addons linking to the wrong operator SVN url's.
Revision: 36502
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36502
Author: campbellbarton
Date: 2011-05-05 14:45:24 + (Thu, 05 May 2011)
Log Message:
---
sphinx api docs: fix for addons linking to the wrong operator SVN url's.
also change from blender from 'release' back to beta so new docs don't
overwrite the 2.57b release docs.
Modified Paths:
--
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/source/blender/blenkernel/BKE_blender.h
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-05-05 14:21:31 UTC
(rev 36501)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-05-05 14:45:24 UTC
(rev 36502)
@@ -810,7 +810,9 @@
# operators
def write_ops():
-API_BASEURL =
https://svn.blender.org/svnroot/bf-blender/trunk/blender/release/scripts;
+API_BASEURL =
http://svn.blender.org/svnroot/bf-blender/trunk/blender/release/scripts;
+API_BASEURL_ADDON =
http://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts;
+API_BASEURL_ADDON_CONTRIB =
http://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts;
op_modules = {}
for op in ops.values():
@@ -849,8 +851,15 @@
location = op.get_location()
if location != (None, None):
-fw( :file: `%s %s/%s`_:%d\n\n % (location[0],
API_BASEURL, location[0], location[1]))
+if location[0].startswith(addons_contrib + os.sep):
+url_base = API_BASEURL_ADDON_CONTRIB
+elif location[0].startswith(addons + os.sep):
+url_base = API_BASEURL_ADDON
+else:
+url_base = API_BASEURL
+fw( :file: `%s %s/%s`_:%d\n\n % (location[0],
url_base, location[0], location[1]))
+
file.close()
if bpy.ops not in EXCLUDE_MODULES:
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2011-05-05
14:21:31 UTC (rev 36501)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2011-05-05
14:45:24 UTC (rev 36502)
@@ -53,7 +53,7 @@
/* can be left blank, otherwise a,b,c... etc with no quotes */
#define BLENDER_VERSION_CHAR b
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE release
+#define BLENDER_VERSION_CYCLE beta
struct ListBase;
struct MemFile;
___
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 [36503] trunk/blender/source/blender/ editors: fix [#27285] Renderslot missing
Revision: 36503
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36503
Author: campbellbarton
Date: 2011-05-05 15:21:43 + (Thu, 05 May 2011)
Log Message:
---
fix [#27285] Renderslot missing
scale fixes size header buttons by DPI
Modified Paths:
--
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===
--- trunk/blender/source/blender/editors/include/UI_interface.h 2011-05-05
14:45:24 UTC (rev 36502)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2011-05-05
15:21:43 UTC (rev 36503)
@@ -160,6 +160,10 @@
#define UI_PANEL_WIDTH 340
#define UI_COMPACT_PANEL_WIDTH 160
+/* scale fixed button widths by this to account for DPI
+ * 8.4852 == sqrtf(72.0f)) */
+#define UI_DPI_FAC (sqrtf((float)U.dpi) / 8.48528137423857f)
+
/* Button types, bits stored in 1 value... and a short even!
- bits 0-4: bitnr (0-31)
- bits 5-7: pointer type
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-05-05 14:45:24 UTC (rev 36502)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-05-05 15:21:43 UTC (rev 36503)
@@ -593,6 +593,7 @@
uiBlock *block= uiLayoutGetBlock(layout);
uiLayout *row;
uiBut *but;
+ const float dpi_fac= UI_DPI_FAC;
row= uiLayoutRow(layout, 1);
@@ -609,7 +610,7 @@
but= uiDefIconBut(block, BUT, 0, ICON_TRIA_RIGHT, 0,0,18,20,
NULL, 0, 0, 0, 0, Next Layer);
uiButSetFunc(but, image_multi_inclay_cb, rr, iuser);
- uiblock_layer_pass_buttons(row, rr, iuser, 230, render_slot);
+ uiblock_layer_pass_buttons(row, rr, iuser, 230 * dpi_fac, render_slot);
/* decrease, increase arrows */
but= uiDefIconBut(block, BUT, 0, ICON_TRIA_LEFT,0,0,17,20,
NULL, 0, 0, 0, 0, Previous Pass);
@@ -841,8 +842,9 @@
/* render layers and passes */
if(ima iuser) {
+ const float dpi_fac= UI_DPI_FAC;
rr= BKE_image_acquire_renderresult(scene, ima);
- uiblock_layer_pass_buttons(layout, rr, iuser, 160,
(ima-type==IMA_TYPE_R_RESULT)? ima-render_slot: NULL);
+ uiblock_layer_pass_buttons(layout, rr, iuser, 160 * dpi_fac,
(ima-type==IMA_TYPE_R_RESULT)? ima-render_slot: NULL);
BKE_image_release_renderresult(scene, ima);
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c
2011-05-05 14:45:24 UTC (rev 36502)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c
2011-05-05 15:21:43 UTC (rev 36503)
@@ -272,7 +272,7 @@
static char *view3d_modeselect_pup(Scene *scene)
{
Object *ob= OBACT;
- static char string[1024];
+ static char string[256];
static char formatstr[] = |%s %%x%d %%i%d;
char *str = string;
@@ -465,6 +465,7 @@
Object *obedit = CTX_data_edit_object(C);
uiBlock *block;
uiLayout *row;
+ const float dpi_fac= UI_DPI_FAC;
RNA_pointer_create(screen-id, RNA_SpaceView3D, v3d, v3dptr);
RNA_pointer_create(scene-id, RNA_ToolSettings, ts, toolsptr);
@@ -484,7 +485,7 @@
uiBlockBeginAlign(block);
uiDefIconTextButS(block, MENU, B_MODESELECT,
object_mode_icon(v3d-modeselect), view3d_modeselect_pup(scene) ,
- 0,0,126,20, (v3d-modeselect), 0, 0, 0, 0, Mode);
+ 0,0,126 * dpi_fac,20, (v3d-modeselect), 0, 0, 0, 0,
Mode);
uiBlockEndAlign(block);
/* Draw type */
@@ -531,7 +532,7 @@
}
str_menu = BIF_menustringTransformOrientation(C, Orientation);
- uiDefButS(block, MENU, B_MAN_MODE, str_menu,0,0,70,YIC,
v3d-twmode, 0, 0, 0, 0, Transform Orientation);
+ uiDefButS(block, MENU, B_MAN_MODE, str_menu,0,0,70 * dpi_fac,
YIC, v3d-twmode, 0, 0, 0, 0, Transform Orientation);
MEM_freeN((void *)str_menu);
}
___
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 [36504] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#27294] Subframes cause dampened particles to behave differently
Revision: 36504 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36504 Author: jhk Date: 2011-05-05 17:07:20 + (Thu, 05 May 2011) Log Message: --- Fix for [#27294] Subframes cause dampened particles to behave differently * The unphysical particle damping wasn't scaled according to the timestep. Modified Paths: -- trunk/blender/source/blender/blenkernel/intern/particle_system.c Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c === --- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2011-05-05 15:21:43 UTC (rev 36503) +++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2011-05-05 17:07:20 UTC (rev 36504) @@ -2553,7 +2553,7 @@ /* damp affects final velocity */ if(part-dampfac != 0.f) - mul_v3_fl(pa-state.vel, 1.f - part-dampfac * efdata.ptex.damp); + mul_v3_fl(pa-state.vel, 1.f - part-dampfac * efdata.ptex.damp * 25.f * dtime); //VECCOPY(pa-state.ave, states-ave); ___ 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 [36505] trunk/blender/source/blender/ windowmanager: fix to scons after exotic was removed (patch from jms)
Revision: 36505 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36505 Author: dfelinto Date: 2011-05-05 18:50:17 + (Thu, 05 May 2011) Log Message: --- fix to scons after exotic was removed (patch from jms) Modified Paths: -- trunk/blender/source/blender/windowmanager/SConscript trunk/blender/source/blender/windowmanager/intern/wm_files.c Modified: trunk/blender/source/blender/windowmanager/SConscript === --- trunk/blender/source/blender/windowmanager/SConscript 2011-05-05 17:07:20 UTC (rev 36504) +++ trunk/blender/source/blender/windowmanager/SConscript 2011-05-05 18:50:17 UTC (rev 36505) @@ -14,6 +14,8 @@ incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' incs += ' #/intern/elbeem #/extern/glew/include' +incs += ' ' + env['BF_ZLIB_INC'] + defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c === --- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2011-05-05 17:07:20 UTC (rev 36504) +++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2011-05-05 18:50:17 UTC (rev 36505) @@ -37,6 +37,8 @@ #include string.h #include errno.h +#include zlib.h /* wm_read_exotic() */ + #ifdef WIN32 #include windows.h /* need to include windows.h so _WIN32_IE is defined */ #ifndef _WIN32_IE @@ -49,8 +51,6 @@ #include unistd.h /* getpid */ #endif -#include zlib.h /* wm_read_exotic() */ - #include MEM_guardedalloc.h #include MEM_CacheLimiterC-Api.h ___ 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 [36506] trunk/blender/source/blender/ windowmanager/CMakeLists.txt: add zlib include dir for cmake too.
Revision: 36506
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36506
Author: campbellbarton
Date: 2011-05-05 22:41:49 + (Thu, 05 May 2011)
Log Message:
---
add zlib include dir for cmake too.
Modified Paths:
--
trunk/blender/source/blender/windowmanager/CMakeLists.txt
Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt 2011-05-05
18:50:17 UTC (rev 36505)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt 2011-05-05
22:41:49 UTC (rev 36506)
@@ -43,6 +43,7 @@
../../../intern/elbeem/extern
../../../intern/ghost
../../../intern/opennl/extern
+ ${ZLIB_INCLUDE_DIRS}
${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}
)
___
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 [36507] trunk/blender/source/blender/ blenlib/intern/path_util.c: [#26715] Blender2. 57 crash when opening in Windows, non-latin char in path
Revision: 36507
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36507
Author: campbellbarton
Date: 2011-05-06 01:03:36 + (Fri, 06 May 2011)
Log Message:
---
[#26715] Blender2.57 crash when opening in Windows, non-latin char in path
this isn't a fix but GetModuleFileName is returning a name that doesn't exist,
so finding python after this isn't working.
Show a popup that the path has an invalid name so at least the user can move it.
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/path_util.c
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2011-05-05
22:41:49 UTC (rev 36506)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2011-05-06
01:03:36 UTC (rev 36507)
@@ -1692,6 +1692,10 @@
#ifdef _WIN32
if(GetModuleFileName(0, fullname, maxlen)) {
GetShortPathName(fullname, fullname, maxlen);
+ if(!BLI_exists(fullname)) {
+ printf(path can't be found: \%.*s\\n, maxlen,
fullname);
+ MessageBox(NULL, path constains invalid characters or
is too long (see console), Error, MB_OK);
+ }
return;
}
#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 [36508] trunk/blender/source/blender/ editors/interface/interface_layout.c: fix [#27304] uiItemsFullEnumO: operator missing srna ''
Revision: 36508
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36508
Author: campbellbarton
Date: 2011-05-06 02:55:09 + (Fri, 06 May 2011)
Log Message:
---
fix [#27304] uiItemsFullEnumO: operator missing srna ''
python strings are not static so dont hold pointers to them within blenders UI.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_layout.c
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===
--- trunk/blender/source/blender/editors/interface/interface_layout.c
2011-05-06 01:03:36 UTC (rev 36507)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c
2011-05-06 02:55:09 UTC (rev 36508)
@@ -1496,8 +1496,10 @@
typedef struct MenuItemLevel {
int opcontext;
- const char *opname;
- const char *propname;
+ /* dont use pointers to the strings because python can dynamically
+* allocate strings and free before the menu draws, see [#27304] */
+ char opname[OP_MAX_TYPENAME];
+ char propname[MAX_IDPROP_NAME];
PointerRNA rnapoin;
} MenuItemLevel;
@@ -1514,11 +1516,16 @@
wmOperatorType *ot= WM_operatortype_find(opname, 1);
MenuItemLevel *lvl;
- if(!ot || !ot-srna) {
+ if(!ot) {
ui_item_disabled(layout, opname);
- RNA_warning(uiItemMenuEnumO: %s '%s'\n, ot ? unknown
operator : operator missing srna, name);
+ RNA_warning(uiItemMenuEnumO: unknown operator '%s'\n, opname);
return;
}
+ if(!ot-srna) {
+ ui_item_disabled(layout, opname);
+ RNA_warning(uiItemMenuEnumO: operator missing srna '%s'\n,
opname);
+ return;
+ }
if(!name)
name= ot-name;
@@ -1526,8 +1533,8 @@
icon= ICON_BLANK1;
lvl= MEM_callocN(sizeof(MenuItemLevel), MenuItemLevel);
- lvl-opname= opname;
- lvl-propname= propname;
+ BLI_strncpy(lvl-opname, opname, sizeof(lvl-opname));
+ BLI_strncpy(lvl-propname, propname, sizeof(lvl-propname));
lvl-opcontext= layout-root-opcontext;
ui_item_menu(layout, name, icon, menu_item_enum_opname_menu, NULL, lvl);
@@ -1560,7 +1567,7 @@
lvl= MEM_callocN(sizeof(MenuItemLevel), MenuItemLevel);
lvl-rnapoin= *ptr;
- lvl-propname= propname;
+ BLI_strncpy(lvl-propname, propname, sizeof(lvl-propname));
lvl-opcontext= layout-root-opcontext;
ui_item_menu(layout, name, icon, menu_item_enum_rna_menu, NULL, lvl);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
