Revision: 41750
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41750
Author: campbellbarton
Date: 2011-11-11 05:52:46 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
svn merge -r41715:41722 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41715
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py
branches/bmesh/blender/intern/cycles/device/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/osl/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/bmesh/blender/intern/cycles/render/CMakeLists.txt
branches/bmesh/blender/intern/cycles/util/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/nodes/CMakeLists.txt
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41715
+ /trunk/blender:39992-41722
Modified: branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py
2011-11-11 05:34:07 UTC (rev 41749)
+++ branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py
2011-11-11 05:52:46 UTC (rev 41750)
@@ -93,6 +93,9 @@
# print(f)
def is_definition(l, f, i, name):
+ if l.startswith("unset("):
+ return False
+
if ('set(%s' % name) in l or ('set(' in l and l.endswith(name)):
if len(l.split()) > 1:
raise Exception("strict formatting not kept 'set(%s*' %s:%d" %
(name, f, i))
Modified: branches/bmesh/blender/intern/cycles/device/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/device/CMakeLists.txt 2011-11-11
05:34:07 UTC (rev 41749)
+++ branches/bmesh/blender/intern/cycles/device/CMakeLists.txt 2011-11-11
05:52:46 UTC (rev 41750)
@@ -21,6 +21,7 @@
set(SRC_HEADERS
device.h
+ device_memory.h
device_intern.h
device_network.h
)
Modified: branches/bmesh/blender/intern/cycles/kernel/osl/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/osl/CMakeLists.txt
2011-11-11 05:34:07 UTC (rev 41749)
+++ branches/bmesh/blender/intern/cycles/kernel/osl/CMakeLists.txt
2011-11-11 05:52:46 UTC (rev 41750)
@@ -1,7 +1,7 @@
set(INC
.
- ../
+ ..
../svm
../../render
../../util
Modified: branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
2011-11-11 05:34:07 UTC (rev 41749)
+++ branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
2011-11-11 05:52:46 UTC (rev 41750)
@@ -50,6 +50,8 @@
set(SRC_OSL_HEADERS
node_texture.h
+ node_color.h
+ node_fresnel.h
stdosl.h
)
Modified: branches/bmesh/blender/intern/cycles/render/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/render/CMakeLists.txt 2011-11-11
05:34:07 UTC (rev 41749)
+++ branches/bmesh/blender/intern/cycles/render/CMakeLists.txt 2011-11-11
05:52:46 UTC (rev 41750)
@@ -16,6 +16,7 @@
buffers.cpp
camera.cpp
film.cpp
+ # film_response.cpp # XXX, why isnt this in?
filter.cpp
graph.cpp
image.cpp
@@ -40,6 +41,7 @@
buffers.h
camera.h
film.h
+ # film_response.h # XXX, why isnt this in?
filter.h
graph.h
image.h
Modified: branches/bmesh/blender/intern/cycles/util/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/util/CMakeLists.txt 2011-11-11
05:34:07 UTC (rev 41749)
+++ branches/bmesh/blender/intern/cycles/util/CMakeLists.txt 2011-11-11
05:52:46 UTC (rev 41750)
@@ -33,6 +33,7 @@
util_cuda.h
util_debug.h
util_dynlib.h
+ util_foreach.h
util_function.h
util_hash.h
util_image.h
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41715
+ /trunk/blender/release:31524-41722
Modified:
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2011-11-11 05:34:07 UTC (rev 41749)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2011-11-11 05:52:46 UTC (rev 41750)
@@ -431,9 +431,10 @@
me= get_mesh(ob);
if(me==NULL || me->totface==0) return;
- if(!me->mcol)
- make_vertexcol(ob);
+ if(!me->mcol) make_vertexcol(ob);
+ if(!me->mcol) return; /* possible we can't make mcol's */
+
selected= (me->editflag & ME_EDIT_PAINT_MASK);
mf = me->mface;
@@ -1758,8 +1759,14 @@
if(dv_copy.dw) {
MEM_freeN(dv_copy.dw);
}
+#if 0
/* dv may have been altered greatly */
dw = defvert_find_index(dv, vgroup);
+#else
+ dw = NULL; /* UNUSED after assignment, set to NULL to ensuyre
we don't
+ * use again, we thats needed un-ifdef the line
above */
+ (void)dw; /* quiet warnigns */
+#endif
if(me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */
int index_mirr= mesh_get_x_mirror_vert(ob, index);
Property changes on:
branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-41715
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-41722
Modified: branches/bmesh/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/nodes/CMakeLists.txt 2011-11-11
05:34:07 UTC (rev 41749)
+++ branches/bmesh/blender/source/blender/nodes/CMakeLists.txt 2011-11-11
05:52:46 UTC (rev 41750)
@@ -131,6 +131,7 @@
shader/nodes/node_shader_vectMath.c
shader/nodes/node_shader_attribute.c
shader/nodes/node_shader_background.c
+ # shader/nodes/node_shader_bsdf_anisotropic.c # XXX, why not included?
shader/nodes/node_shader_bsdf_diffuse.c
shader/nodes/node_shader_bsdf_glossy.c
shader/nodes/node_shader_bsdf_glass.c
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
