svn merge -r41715:41722 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 Nov 2011 05:52:46 +0000 (05:52 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 Nov 2011 05:52:46 +0000 (05:52 +0000)
build_files/cmake/cmake_consistency_check.py
intern/cycles/device/CMakeLists.txt
intern/cycles/kernel/osl/CMakeLists.txt
intern/cycles/kernel/osl/nodes/CMakeLists.txt
intern/cycles/render/CMakeLists.txt
intern/cycles/util/CMakeLists.txt
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/nodes/CMakeLists.txt

index 6fdd178929b8f89b8ae1ccb5233dba978af53b58..be68455a113e7fa39337e8254b5b8ec62ef3307a 100755 (executable)
@@ -93,6 +93,9 @@ def cmake_get_src(f):
     # 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))
index e1fb44b92b43ce576439f5ea3088ec840b8f0c51..17072d230bb14defd7384513244c97c0592b27d5 100644 (file)
@@ -21,6 +21,7 @@ set(SRC
 
 set(SRC_HEADERS
        device.h
+       device_memory.h
        device_intern.h
        device_network.h
 )
index b010bba4d2595eb9bc2ecfeea5ef2ef2fc746f9a..ae88008cf71e3cb80349dac185a581694ec41c9e 100644 (file)
@@ -1,7 +1,7 @@
 
 set(INC
        .
-       ../
+       ..
        ../svm
        ../../render
        ../../util
index 389638b671b1882dea6711439c3813629df1cd51..1b8b81eb6f6f948694d91be56b0107a7a1fd15ef 100644 (file)
@@ -50,6 +50,8 @@ set(SRC_OSL
 
 set(SRC_OSL_HEADERS
        node_texture.h
+       node_color.h
+       node_fresnel.h
        stdosl.h
 )
 
index 1dcd70bdf65184172af93a57fa82d6244e59f97e..85552508bb916fa63a518d0d9309003af2acb8e7 100644 (file)
@@ -16,6 +16,7 @@ set(SRC
        buffers.cpp
        camera.cpp
        film.cpp
+       # film_response.cpp  # XXX, why isnt this in?
        filter.cpp
        graph.cpp
        image.cpp
@@ -40,6 +41,7 @@ set(SRC_HEADERS
        buffers.h
        camera.h
        film.h
+       # film_response.h  # XXX, why isnt this in?
        filter.h
        graph.h
        image.h
index da183aaaeb231aba45716ffdee7c8a80d9cc8914..76e948504ebb1fc2888080f792e2cc3a47d68085 100644 (file)
@@ -33,6 +33,7 @@ set(SRC_HEADERS
        util_cuda.h
        util_debug.h
        util_dynlib.h
+       util_foreach.h
        util_function.h
        util_hash.h
        util_image.h
index 4d024113cf88c10e04f06d0167baa9d577bd1a2c..04239ab950808e49f6fd1692a80c80168af458c0 100644 (file)
@@ -431,8 +431,9 @@ void vpaint_fill(Object *ob, unsigned int paintcol)
        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);
 
@@ -1758,8 +1759,14 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
                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);
index 368ab1db50c8372c0aa8e65606fbfac1f960bafb..1b327edbc9f3d88bdc3bc862dd7a801fb5ca1303 100644 (file)
@@ -131,6 +131,7 @@ set(SRC
        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