Revision: 42522
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42522
Author: campbellbarton
Date: 2011-12-09 00:23:57 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42516:42521
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42516
Modified Paths:
--------------
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
branches/bmesh/blender/intern/cycles/kernel/SConscript
branches/bmesh/blender/intern/cycles/render/mesh.cpp
branches/bmesh/blender/intern/cycles/render/sobol.cpp
branches/bmesh/blender/intern/cycles/render/sobol.h
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
Property Changed:
----------------
branches/bmesh/blender/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42516
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42521
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-12-08 21:55:35 UTC (rev 42521)
+++ branches/bmesh/blender/SConstruct 2011-12-09 00:23:57 UTC (rev 42522)
@@ -119,6 +119,12 @@
if tempbitness in (32, 64): # only set if 32 or 64 has been given
bitness = int(tempbitness)
+if bitness:
+ B.bitness = bitness
+else:
+ B.bitness = tempbitness
+
+
# first check cmdline for toolset and we create env to work on
quickie = B.arguments.get('BF_QUICK', None)
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-12-08
21:55:35 UTC (rev 42521)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-12-09
00:23:57 UTC (rev 42522)
@@ -50,6 +50,7 @@
arguments = None
targets = None
resources = []
+bitness = 0
#some internals
blenderdeps = [] # don't manipulate this one outside this module!
Modified: branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
2011-12-08 21:55:35 UTC (rev 42521)
+++ branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
2011-12-09 00:23:57 UTC (rev 42522)
@@ -269,7 +269,7 @@
if(!experimental || RNA_enum_get(&cscene, "gpu_type") == 0)
dtype = DEVICE_CUDA;
else
- dtype = DEVICE_CUDA;
+ dtype = DEVICE_OPENCL;
if(device_type_available(types, dtype))
params.device_type = dtype;
Modified: branches/bmesh/blender/intern/cycles/kernel/SConscript
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/SConscript 2011-12-08
21:55:35 UTC (rev 42521)
+++ branches/bmesh/blender/intern/cycles/kernel/SConscript 2011-12-09
00:23:57 UTC (rev 42522)
@@ -1,6 +1,7 @@
#!/usr/bin/python
import sys
import os
+import Blender as B
def normpath(path):
return os.path.abspath(os.path.normpath(path))
@@ -9,6 +10,12 @@
kernel_binaries = []
+#Bitness
+if B.bitness == 32:
+ bits = 32
+else:
+ bits = 64
+
if env['WITH_BF_CYCLES_CUDA_BINARIES']:
kernel = env.Clone()
@@ -27,7 +34,8 @@
svm_dir = os.path.join(source_dir, "../svm")
# nvcc flags
- nvcc_flags = "--cubin -use_fast_math --ptxas-options=\"-v\"
--maxrregcount=24"
+ nvcc_flags = "-m%s" % (bits)
+ nvcc_flags += " --cubin -use_fast_math --ptxas-options=\"-v\"
--maxrregcount=24"
nvcc_flags += " --opencc-options -OPT:Olimit=0"
nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
nvcc_flags += " -I \"%s\" -I \"%s\"" % (util_dir, svm_dir)
Modified: branches/bmesh/blender/intern/cycles/render/mesh.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/render/mesh.cpp 2011-12-08
21:55:35 UTC (rev 42521)
+++ branches/bmesh/blender/intern/cycles/render/mesh.cpp 2011-12-09
00:23:57 UTC (rev 42522)
@@ -270,15 +270,19 @@
void Mesh::tag_update(Scene *scene, bool rebuild)
{
need_update = true;
- if(rebuild)
+
+ if(rebuild) {
need_update_rebuild = true;
+ scene->light_manager->need_update = true;
+ }
+ else {
+ foreach(uint sindex, used_shaders)
+ if(scene->shaders[sindex]->has_surface_emission)
+ scene->light_manager->need_update = true;
+ }
scene->mesh_manager->need_update = true;
scene->object_manager->need_update = true;
-
- foreach(uint sindex, used_shaders)
- if(scene->shaders[sindex]->has_surface_emission)
- scene->light_manager->need_update = true;
}
/* Mesh Manager */
@@ -685,9 +689,9 @@
if(!mesh->transform_applied) {
string msg = "Updating Mesh BVH ";
if(mesh->name == "")
- msg += string_printf("%lu/%lu",
(unsigned long)(i+1), (unsigned long)num_instance_bvh);
+ msg += string_printf("%u/%u",
(uint)(i+1), (uint)num_instance_bvh);
else
- msg += string_printf("%s %lu/%lu",
mesh->name.c_str(), (unsigned long)(i+1), (unsigned long)num_instance_bvh);
+ msg += string_printf("%s %u/%u",
mesh->name.c_str(), (uint)(i+1), (uint)num_instance_bvh);
progress.set_status(msg, "Building BVH");
mesh->compute_bvh(&scene->params, progress);
Modified: branches/bmesh/blender/intern/cycles/render/sobol.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/render/sobol.cpp 2011-12-08
21:55:35 UTC (rev 42521)
+++ branches/bmesh/blender/intern/cycles/render/sobol.cpp 2011-12-09
00:23:57 UTC (rev 42522)
@@ -47,6 +47,7 @@
*/
#include "util_debug.h"
+#include "util_types.h"
#include "sobol.h"
@@ -55,8 +56,8 @@
#define SOBOL_MAX_NUMBER 32
typedef struct SobolDirectionNumbers {
- unsigned int d, s, a;
- unsigned int m[SOBOL_MAX_NUMBER];
+ uint d, s, a;
+ uint m[SOBOL_MAX_NUMBER];
} SobolDirectionNumbers;
static SobolDirectionNumbers SOBOL_NUMBERS[SOBOL_MAX_DIMENSIONS-1] = {
@@ -21262,38 +21263,38 @@
{21201, 18, 131059, {1, 1, 7, 11, 15, 7, 37, 239, 337, 245, 1557, 3681, 7357,
9639, 27367, 26869, 114603, 86317}}
};
-void sobol_generate_direction_vectors(unsigned int vectors[][SOBOL_BITS], int
dimensions)
+void sobol_generate_direction_vectors(uint vectors[][SOBOL_BITS], int
dimensions)
{
assert(dimensions <= SOBOL_MAX_DIMENSIONS);
- const unsigned int L = SOBOL_BITS;
+ const uint L = SOBOL_BITS;
/* first dimension is exception */
- unsigned int *v = vectors[0];
+ uint *v = vectors[0];
- for(unsigned int i = 0; i < L; i++)
+ for(uint i = 0; i < L; i++)
v[i] = 1 << (31-i); // all m's = 1
for(int dim = 1; dim < dimensions; dim++) {
SobolDirectionNumbers *numbers = &SOBOL_NUMBERS[dim-1];
- unsigned int s = numbers->s;
- unsigned int a = numbers->a;
- unsigned int *m = numbers->m;
+ uint s = numbers->s;
+ uint a = numbers->a;
+ uint *m = numbers->m;
v = vectors[dim];
if(L <= s) {
- for(unsigned int i = 0; i < L; i++)
+ for(uint i = 0; i < L; i++)
v[i] = m[i] << (31-i);
}
else {
- for(unsigned int i = 0; i < s; i++)
+ for(uint i = 0; i < s; i++)
v[i] = m[i] << (31-i);
- for(unsigned int i = s; i < L; i++) {
+ for(uint i = s; i < L; i++) {
v[i] = v[i-s] ^ (v[i-s] >> s);
- for(unsigned int k = 1; k < s; k++)
+ for(uint k = 1; k < s; k++)
v[i] ^= (((a >> (s-1-k)) & 1) *
v[i-k]);
}
}
Modified: branches/bmesh/blender/intern/cycles/render/sobol.h
===================================================================
--- branches/bmesh/blender/intern/cycles/render/sobol.h 2011-12-08 21:55:35 UTC
(rev 42521)
+++ branches/bmesh/blender/intern/cycles/render/sobol.h 2011-12-09 00:23:57 UTC
(rev 42522)
@@ -19,12 +19,14 @@
#ifndef __SOBOL_H__
#define __SOBOL_H__
+#include "util_types.h"
+
CCL_NAMESPACE_BEGIN
#define SOBOL_BITS 32
#define SOBOL_MAX_DIMENSIONS 21201
-void sobol_generate_direction_vectors(unsigned int vectors[][SOBOL_BITS], int
dimensions);
+void sobol_generate_direction_vectors(uint vectors[][SOBOL_BITS], int
dimensions);
CCL_NAMESPACE_END
Modified:
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
---
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
2011-12-08 21:55:35 UTC (rev 42521)
+++
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
2011-12-09 00:23:57 UTC (rev 42522)
@@ -5241,11 +5241,14 @@
data->state= state;
- if(!ELEM(state, BUTTON_STATE_EXIT, BUTTON_STATE_HIGHLIGHT)) {
- /* When objects for eg. are removed, running ui_check_but()
- * can access the removed data - so disable update on exit
- * or highlight */
- ui_check_but(but);
+ if(state != BUTTON_STATE_EXIT) {
+ /* When objects for eg. are removed, running ui_check_but() can
access
+ the removed data - so disable update on exit. Also in case of
+ highlight when not in a popup menu, we remove because data
used in
+ button below popup might have been removed by action of
popup. Needs
+ a more reliable solution... */
+ if(state != BUTTON_STATE_HIGHLIGHT || but->block->handle)
+ ui_check_but(but);
}
/* redraw */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
