[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59932] branches/soc-2013-dingto: Branch maintenance:
Thomas Dinges
blender at dingto.org
Mon Sep 9 02:22:00 CEST 2013
Revision: 59932
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59932
Author: dingto
Date: 2013-09-09 00:22:00 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Branch maintenance:
* Revert r59183 and r57612 of my branch. Those changes were experimental. In case we need it, it's still in SVN history.
* Also fix a mismatch in gpu_shader_material.glsl.
Trunk and my branch are now equal, except splash.png. Compared with Meld, thanks to Campbell for the suggestion. :)
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59183
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57612
Modified Paths:
--------------
branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp
branches/soc-2013-dingto/intern/cycles/device/device.h
branches/soc-2013-dingto/intern/cycles/device/device_cpu.cpp
branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
branches/soc-2013-dingto/intern/cycles/device/device_multi.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_textures.h
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_image.h
branches/soc-2013-dingto/intern/cycles/render/image.cpp
branches/soc-2013-dingto/intern/cycles/render/image.h
branches/soc-2013-dingto/intern/cycles/render/object.cpp
branches/soc-2013-dingto/intern/cycles/render/object.h
branches/soc-2013-dingto/intern/cycles/render/scene.cpp
branches/soc-2013-dingto/intern/cycles/render/scene.h
branches/soc-2013-dingto/source/blender/gpu/shaders/gpu_shader_material.glsl
Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py 2013-09-09 00:22:00 UTC (rev 59932)
@@ -577,31 +577,6 @@
del bpy.types.World.cycles
-class CyclesObjectSettings(bpy.types.PropertyGroup):
- @classmethod
- def register(cls):
- bpy.types.Object.cycles_settings = PointerProperty(
- name="Cycles Object Settings",
- description="Cycles object settings",
- type=cls,
- )
- cls.use_motion = BoolProperty(
- name="Motion Blur",
- description="Enable or disable motion blur for this object",
- default=True,
- )
- cls.motion_multiplier = FloatProperty(
- name="Motion Multiplier",
- description="Multiplier for Object motion blur shutter time",
- min=0.0, soft_max=10.0, max=100.0,
- default=1.0,
- )
-
-
- @classmethod
- def unregister(cls):
- del bpy.types.Object.cycles_settings
-
class CyclesVisibilitySettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-09-09 00:22:00 UTC (rev 59932)
@@ -614,26 +614,6 @@
flow.prop(visibility, "shadow")
-class CyclesObject_PT_settings(CyclesButtonsPanel, Panel):
- bl_label = "Settings"
- bl_context = "object"
- bl_options = {'DEFAULT_CLOSED'}
-
- @classmethod
- def poll(cls, context):
- ob = context.object
- return CyclesButtonsPanel.poll(context) and ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'LAMP'}
-
- def draw(self, context):
- layout = self.layout
-
- ob = context.object
- settings = ob.cycles_settings
-
- layout.prop(settings, "use_motion")
- #layout.prop(settings, "motion_multiplier")
-
-
class CYCLES_OT_use_shading_nodes(Operator):
"""Enable nodes on a material, world or lamp"""
bl_idname = "cycles.use_shading_nodes"
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp 2013-09-09 00:22:00 UTC (rev 59932)
@@ -239,17 +239,13 @@
object = object_map.find(key);
if(object) {
- PointerRNA csettings = RNA_pointer_get(&b_ob.ptr, "cycles_settings");
-
- object->motion_multiplier = get_float(csettings, "motion_multiplier");
-
if(tfm != object->tfm) {
if(motion == -1)
object->motion.pre = tfm;
else
object->motion.post = tfm;
-
- object->use_motion = get_boolean(csettings, "use_motion");
+
+ object->use_motion = true;
}
/* mesh deformation blur not supported yet */
Modified: branches/soc-2013-dingto/intern/cycles/device/device.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/device/device.h 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/device/device.h 2013-09-09 00:22:00 UTC (rev 59932)
@@ -51,7 +51,6 @@
string description;
string id;
int num;
- int extended_images;
bool display_device;
bool advanced_shading;
bool pack_images;
@@ -62,7 +61,6 @@
type = DEVICE_CPU;
id = "CPU";
num = 0;
- extended_images = false;
display_device = false;
advanced_shading = true;
pack_images = false;
Modified: branches/soc-2013-dingto/intern/cycles/device/device_cpu.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/device/device_cpu.cpp 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/device/device_cpu.cpp 2013-09-09 00:22:00 UTC (rev 59932)
@@ -364,7 +364,6 @@
info.description = system_cpu_brand_string();
info.id = "CPU";
info.num = 0;
- info.extended_images = true;
info.advanced_shading = true;
info.pack_images = false;
Modified: branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp 2013-09-09 00:22:00 UTC (rev 59932)
@@ -1044,7 +1044,6 @@
int major, minor;
cuDeviceComputeCapability(&major, &minor, num);
info.advanced_shading = (major >= 2);
- info.extended_images = (major >= 3);
info.pack_images = false;
/* if device has a kernel timeout, assume it is used for display */
Modified: branches/soc-2013-dingto/intern/cycles/device/device_multi.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/device/device_multi.cpp 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/device/device_multi.cpp 2013-09-09 00:22:00 UTC (rev 59932)
@@ -328,7 +328,6 @@
info.advanced_shading = with_advanced_shading;
info.pack_images = false;
- info.extended_images = true;
foreach(DeviceInfo& subinfo, devices) {
if(subinfo.type == type) {
@@ -352,7 +351,6 @@
if(subinfo.display_device)
info.display_device = true;
info.pack_images = info.pack_images || subinfo.pack_images;
- info.extended_images = info.extended_images && subinfo.extended_images;
num_added++;
}
}
Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_textures.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_textures.h 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_textures.h 2013-09-09 00:22:00 UTC (rev 59932)
@@ -174,61 +174,6 @@
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099)
-/* Kepler and above */
-#if defined(__KERNEL_CUDA__) && __CUDA_ARCH__ >= 300
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_100)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_101)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_102)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_103)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_104)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_105)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_106)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_107)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_108)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_109)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_110)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_111)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_112)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_113)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_114)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_115)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_116)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_117)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_118)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_119)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_120)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_121)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_122)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_123)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_124)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_125)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_126)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_127)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_128)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_129)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_130)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_131)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_132)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_133)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_134)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_135)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_136)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_137)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_138)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_139)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_140)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_141)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_142)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_143)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_144)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_145)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_146)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_147)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_148)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_149)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_150)
-#endif
-
/* packed image (opencl) */
KERNEL_TEX(uchar4, texture_uchar4, __tex_image_packed)
KERNEL_TEX(uint4, texture_uint4, __tex_image_packed_info)
Modified: branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_image.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_image.h 2013-09-09 00:06:23 UTC (rev 59931)
+++ branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_image.h 2013-09-09 00:22:00 UTC (rev 59932)
@@ -227,60 +227,6 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list