style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Dec 2012 14:19:05 +0000 (14:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Dec 2012 14:19:05 +0000 (14:19 +0000)
39 files changed:
source/blender/blenfont/intern/blf_lang.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/pointcache.c
source/blender/bmesh/intern/bmesh_operator_api.h
source/blender/editors/screen/area.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_logic/space_logic.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/imbuf/intern/IMB_metadata.h
source/blender/imbuf/intern/dds/dds_api.cpp
source/blender/imbuf/intern/imageprocess.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/nodes/intern/node_common.c
source/blender/nodes/intern/node_exec.c
source/blender/nodes/shader/node_shader_util.c
source/blender/nodes/shader/nodes/node_shader_common.c
source/blender/nodes/shader/nodes/node_shader_mapping.c
source/blender/python/generic/py_capi_utils.h
source/blender/render/intern/raytrace/rayobject_instance.cpp
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/renderdatabase.c
source/blender/render/intern/source/shadbuf.c
source/blender/render/intern/source/strand.c
source/blender/render/intern/source/volume_precache.c
source/blenderplayer/bad_level_call_stubs/stubs.c

index 4d066ea87403b526d53897436a2421849be6f43f..9086799f98456cc51bdf28ddc9fb976702d38410 100644 (file)
@@ -100,7 +100,7 @@ static void fill_locales(void)
        /* First loop to find highest locale ID */
        while (line) {
                int t;
-               str = (char*) line->link;
+               str = (char *)line->link;
                if (str[0] == '#' || str[0] == '\0') {
                        line = line->next;
                        continue; /* Comment or void... */
@@ -118,12 +118,12 @@ static void fill_locales(void)
        line = lines;
        /* Do not allocate locales with zero-sized mem, as LOCALE macro uses NULL locales as invalid marker! */
        if (num_locales > 0) {
-               locales = MEM_callocN(num_locales * sizeof(char*), __func__);
+               locales = MEM_callocN(num_locales * sizeof(char *), __func__);
                while (line) {
                        int id;
                        char *loc, *sep1, *sep2, *sep3;
 
-                       str = (char*) line->link;
+                       str = (char *)line->link;
                        if (str[0] == '#' || str[0] == '\0') {
                                line = line->next;
                                continue;
@@ -230,7 +230,7 @@ void BLF_lang_set(const char *str)
        bl_locale_set(short_locale_utf8);
 
        if (short_locale[0]) {
-               MEM_freeN((void*)short_locale_utf8);
+               MEM_freeN((void *)short_locale_utf8);
        }
 }
 
index f1d73c7777aef2e12260f0105e4e5d283274ac4a..fdd7dc94979e628deb732c687757e016773f0708 100644 (file)
@@ -1153,7 +1153,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
                if ( !mface[i].v4 )
                        continue;
 
-               spring = ( ClothSpring *) MEM_callocN ( sizeof ( ClothSpring ), "cloth spring" );
+               spring = (ClothSpring *)MEM_callocN(sizeof(ClothSpring), "cloth spring");
                
                if (!spring) {
                        cloth_free_errorsprings(cloth, edgehash, edgelist);
index f0043d9fa77f27df45cc38c21efd103d3082e28b..60bf67e19e36eadbc238fe5320808f6b11ea8a49 100644 (file)
@@ -528,7 +528,7 @@ static void add_collision_object(Object ***objs, unsigned int *numobj, unsigned
                /* extend array */
                if (*numobj >= *maxobj) {
                        *maxobj *= 2;
-                       *objs= MEM_reallocN(*objs, sizeof(Object*)*(*maxobj));
+                       *objs= MEM_reallocN(*objs, sizeof(Object *)*(*maxobj));
                }
                
                (*objs)[*numobj] = ob;
@@ -740,7 +740,7 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData * clmd, float step, flo
        /* move object to position (step) in time */
        for (i = 0; i < numcollobj; i++) {
                Object *collob= collobjs[i];
-               CollisionModifierData *collmd = (CollisionModifierData*)modifiers_findByType(collob, eModifierType_Collision);
+               CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision);
 
                if (!collmd->bvhtree)
                        continue;
@@ -760,7 +760,7 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData * clmd, float step, flo
                // check all collision objects
                for (i = 0; i < numcollobj; i++) {
                        Object *collob= collobjs[i];
-                       CollisionModifierData *collmd = (CollisionModifierData*)modifiers_findByType(collob, eModifierType_Collision);
+                       CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision);
                        BVHTreeOverlap *overlap = NULL;
                        unsigned int result = 0;
                        
index 7782afaca25b092be7fd3227e5e30570fe37b9e3..22995e5a7eed4d7b38fc71f38601e6a97cf8488d 100644 (file)
@@ -1996,7 +1996,7 @@ int BKE_imbuf_write_stamp(Scene *scene, struct Object *camera, ImBuf *ibuf, cons
 
 
 static void do_makepicstring(char *string, const char *base, const char *relbase, int frame, const char imtype,
-                                                        const ImageFormatData *im_format, const short use_ext, const short use_frames)
+                             const ImageFormatData *im_format, const short use_ext, const short use_frames)
 {
        if (string == NULL) return;
        BLI_strncpy(string, base, FILE_MAX - 10);   /* weak assumption */
index 8babdf2402fc882505ac0e3a57dd6b979b44dc71..a6ec1f33edcf5552627732f19e9990703093858e 100644 (file)
@@ -1161,11 +1161,11 @@ void ntreeSetOutput(bNodeTree *ntree)
 bNodeTree *ntreeFromID(ID *id)
 {
        switch (GS(id->name)) {
-               case ID_MA: return ((Material*)id)->nodetree;
-               case ID_LA: return ((Lamp*)id)->nodetree;
-               case ID_WO: return ((World*)id)->nodetree;
-               case ID_TE: return ((Tex*)id)->nodetree;
-               case ID_SCE: return ((Scene*)id)->nodetree;
+               case ID_MA:  return ((Material *)id)->nodetree;
+               case ID_LA:  return ((Lamp *)id)->nodetree;
+               case ID_WO:  return ((World *)id)->nodetree;
+               case ID_TE:  return ((Tex *)id)->nodetree;
+               case ID_SCE: return ((Scene *)id)->nodetree;
                default: return NULL;
        }
 }
index 2eadfe73858f9290215aa2b1b7b89193d622947b..9c3c1b0e508ce0a00136e798a9e4009b0db2b9b5 100644 (file)
@@ -1540,7 +1540,7 @@ void BKE_ptcache_mem_pointers_incr(PTCacheMem *pm)
 
        for (i=0; i<BPHYS_TOT_DATA; i++) {
                if (pm->cur[i])
-                       pm->cur[i] = (char*)pm->cur[i] + ptcache_data_size[i];
+                       pm->cur[i] = (char *)pm->cur[i] + ptcache_data_size[i];
        }
 }
 int  BKE_ptcache_mem_pointers_seek(int point_index, PTCacheMem *pm)
@@ -1558,7 +1558,7 @@ int  BKE_ptcache_mem_pointers_seek(int point_index, PTCacheMem *pm)
        }
 
        for (i=0; i<BPHYS_TOT_DATA; i++)
-               pm->cur[i] = data_types & (1<<i) ? (char*)pm->data[i] + index * ptcache_data_size[i] : NULL;
+               pm->cur[i] = data_types & (1<<i) ? (char *)pm->data[i] + index * ptcache_data_size[i] : NULL;
 
        return 1;
 }
index 7df9c94a2f198d5b8592ebdf434568c0ac856251..b8fbfbee37feed0af86198baf4ee431d37b2094f 100644 (file)
@@ -435,7 +435,7 @@ void BMO_slot_buffer_from_all(BMesh *bm, BMOperator *op, BMOpSlot slot_args[BMO_
  *        //whether it's a float, pointer, whatever.
  *        //
  *        // so to get a pointer, for example, use:
- *        //  *((void**)BMO_iter_map_value(&oiter));
+ *        //  *((void **)BMO_iter_map_value(&oiter));
  *        //or something like that.
  *    }
  * \endcode
index 0e8628d47bfe3b0502cd61cab7c6b1c90f5daf2f..827f19307b8653909489efd71b05ae2b5b759f06 100644 (file)
@@ -1677,7 +1677,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *
                                if (pt->draw_header && !(pt->flag & PNL_NO_HEADER) && (open || vertical)) {
                                        /* for enabled buttons */
                                        panel->layout = uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER,
-                                                                                                 triangle, (UI_UNIT_Y * 1.1f) + style->panelspace, UI_UNIT_Y, 1, style);
+                                                                     triangle, (UI_UNIT_Y * 1.1f) + style->panelspace, UI_UNIT_Y, 1, style);
 
                                        pt->draw_header(C, panel);
 
@@ -1699,7 +1699,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char *
                                                panelContext = UI_LAYOUT_PANEL;
                                        
                                        panel->layout = uiBlockLayout(block, UI_LAYOUT_VERTICAL, panelContext,
-                                                                                                 style->panelspace, 0, w - 2 * style->panelspace, em, style);
+                                                                     style->panelspace, 0, w - 2 * style->panelspace, em, style);
 
                                        pt->draw(C, panel);
 
index 17bf5c841c343bc8f9d19fc7a3bca233b1eee869..6a61a6c45dc1f36903801382e6aeda9ac2f2fa58 100644 (file)
@@ -2070,7 +2070,6 @@ static int wpaint_ensure_data(bContext *C, wmOperator *op)
                return FALSE;
        }
 
-       me = BKE_mesh_from_object(ob);
        if (me == NULL || me->totpoly == 0) {
                return FALSE;
        }
index 007450625821dd5798c4ea5aec60db5dd02f0e6f..a7599f21ad5daac0e1baf828442422fdfa278edb 100644 (file)
@@ -1006,7 +1006,7 @@ static void draw_sensor_actuator(uiLayout *layout, PointerRNA *ptr)
 
 static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)
 {
-       bSensor *sens = (bSensor*)ptr->data;
+       bSensor *sens = (bSensor *)ptr->data;
        bArmatureSensor *as = (bArmatureSensor *) sens->data;
        Object *ob = (Object *)ptr->id.data;
        PointerRNA pose_ptr, pchan_ptr;
@@ -1476,7 +1476,7 @@ static void draw_actuator_action(uiLayout *layout, PointerRNA *ptr)
 
 static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
 {
-       bActuator *act = (bActuator*)ptr->data;
+       bActuator *act = (bActuator *)ptr->data;
        bArmatureActuator *aa = (bArmatureActuator *) act->data;
        Object *ob = (Object *)ptr->id.data;
        bConstraint *constraint = NULL;
index 4cd53215697a9cc3840b6ccc7d69621c1a27a0cf..8795d655e77ef6b5d3610cb9b407fdf7dadd2bdf 100644 (file)
@@ -148,7 +148,7 @@ static SpaceLink *logic_new(const bContext *C)
 /* not spacelink itself */
 static void logic_free(SpaceLink *UNUSED(sl))
 {      
-//     Spacelogic *slogic= (SpaceLogic*) sl;
+//     Spacelogic *slogic= (SpaceLogic *) sl;
        
 //     if (slogic->gpd)
 // XXX         BKE_gpencil_free(slogic->gpd);
index b702dc4c0bc0ba21deddf82664df53528252afcc..8797cb4a4598dc726b1c9e768eaa24a20823abda 100644 (file)
@@ -399,8 +399,8 @@ static void node_buts_curvecol(uiLayout *layout, bContext *UNUSED(C), PointerRNA
 
 static void node_buts_normal(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-       bNode *node = (bNode*)ptr->data;
+       bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+       bNode *node = (bNode *)ptr->data;
        bNodeSocket *sock = node->outputs.first;     /* first socket stores normal */
        PointerRNA sockptr;
 
index f7219f8bd1b6695df88830b040609ad4ba8a2bdf..96e43dafa2fc714cfa8765cd3dcb9b85826bc6a2 100644 (file)
@@ -1606,7 +1606,7 @@ static int stitch_init(bContext *C, wmOperator *op)
        }
 
        uvedit_get_aspect(scene, obedit, em, &aspx, &aspy);
-       state->aspect = aspx/aspy;
+       state->aspect = aspx / aspy;
 
        /* Entirely possible if redoing last operator that static island is bigger than total number of islands.
         * This ensures we get no hang in the island checking code in stitch_stitch_process_data. */
index 0746230270026f6dae9309cf713f2c0af4b0468e..a633b39cb323d04d8a64c7d84be75b4dba9f7de4 100644 (file)
@@ -92,7 +92,7 @@ void GPU_render_text(MTFace *tface, int mode,
        float *v1, float *v2, float *v3, float *v4, int glattrib)
 {
        if ((mode & GEMAT_TEXT) && (textlen>0) && tface->tpage) {
-               Image* ima = (Image*)tface->tpage;
+               Image* ima = (Image *)tface->tpage;
                int index, character;
                float centerx, centery, sizex, sizey, transx, transy, movex, movey, advance;
                float advance_tab;
@@ -813,7 +813,7 @@ void GPU_create_gl_tex_compressed(unsigned int *bind, unsigned int *pix, int x,
        glBindTexture(GL_TEXTURE_2D, *bind);
 
        if (GPU_upload_dxt_texture(ibuf) == 0) {
-               glDeleteTextures(1, (GLuint*)bind);
+               glDeleteTextures(1, (GLuint *)bind);
                GPU_create_gl_tex(bind, pix, NULL, x, y, mipmap, 0, ima);
        }
 #endif
index 7a0ac29c9ab3e31c4fd25bd469919ae3cd10fafe..bc859d0ec07b8f13989bccc02273542f2bebab4a 100644 (file)
@@ -134,8 +134,8 @@ void GPU_extensions_init(void)
        glGetIntegerv(GL_BLUE_BITS, &b);
        GG.colordepth = r+g+b; /* assumes same depth for RGB */
 
-       vendor = (const char*)glGetString(GL_VENDOR);
-       renderer = (const char*)glGetString(GL_RENDERER);
+       vendor = (const char *)glGetString(GL_VENDOR);
+       renderer = (const char *)glGetString(GL_RENDERER);
 
        if (strstr(vendor, "ATI")) {
                GG.device = GPU_DEVICE_ATI;
@@ -916,7 +916,7 @@ void GPU_framebuffer_blur(GPUFrameBuffer *fb, GPUTexture *tex, GPUFrameBuffer *b
        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, blurfb->object);
 
        GPU_shader_bind(blur_shader);
-       GPU_shader_uniform_vector(blur_shader, scale_uniform, 2, 1, (float*)scaleh);
+       GPU_shader_uniform_vector(blur_shader, scale_uniform, 2, 1, (float *)scaleh);
        GPU_shader_uniform_texture(blur_shader, texture_source_uniform, tex);
        glViewport(0, 0, GPU_texture_opengl_width(blurtex), GPU_texture_opengl_height(blurtex));
 
@@ -942,7 +942,7 @@ void GPU_framebuffer_blur(GPUFrameBuffer *fb, GPUTexture *tex, GPUFrameBuffer *b
 
        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb->object);
        glViewport(0, 0, GPU_texture_opengl_width(tex), GPU_texture_opengl_height(tex));
-       GPU_shader_uniform_vector(blur_shader, scale_uniform, 2, 1, (float*)scalev);
+       GPU_shader_uniform_vector(blur_shader, scale_uniform, 2, 1, (float *)scalev);
        GPU_shader_uniform_texture(blur_shader, texture_source_uniform, blurtex);
        GPU_texture_bind(blurtex, 0);
 
index ef992e1d0106cfa42b9d26746cc3a7a74c854127..f940d2635dc5f47e4cf650d2aff507dee962f8f9 100644 (file)
@@ -370,7 +370,7 @@ static int initialize_chain(Object *ob, bPoseChannel *pchan_tip, bConstraint *co
 
 static bool is_cartesian_constraint(bConstraint *con)
 {
-       //bKinematicConstraint* data=(bKinematicConstraint*)con->data;
+       //bKinematicConstraint* data=(bKinematicConstraint *)con->data;
 
        return true;
 }
index a68d7a7813e800f3a272977d1328160284fed339..f731fd696207c8d473166d21397c7f59c9c531c9 100644 (file)
@@ -42,7 +42,7 @@ typedef struct ImMetaData {
        int len;
 } ImMetaData;
 
-/** The metadata is a list of key/value pairs (both char*) that can me
+/** The metadata is a list of key/value pairs (both char *) that can me
  * saved in the header of several image formats.
  * Apart from some common keys like
  * 'Software' and 'Description' (png standard) we'll use keys within the
index 5459cffe59064b4f337be41824bc4a881e94bab6..c41bbd594b32d9d611911627e9e2fe7ddc6fc2cb 100644 (file)
@@ -164,7 +164,7 @@ struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags, char colo
                }
 
                if (ibuf->dds_data.fourcc != FOURCC_DDS) {
-                       ibuf->dds_data.data = (unsigned char*)dds.readData(ibuf->dds_data.size);
+                       ibuf->dds_data.data = (unsigned char *)dds.readData(ibuf->dds_data.size);
 
                        /* flip compressed texture */
                        FlipDXTCImage(dds.width(), dds.height(), dds.mipmapCount(), dds.fourCC(), ibuf->dds_data.data);
index 92b8dd8c724837facba4b51dd2b71fca225124fc..1eac6236829e0c5762660c89e976b44c980429bb 100644 (file)
@@ -104,7 +104,7 @@ void bicubic_interpolation_color(struct ImBuf *in, unsigned char outI[4], float
                BLI_bicubic_interpolation_fl(in->rect_float, outF, in->x, in->y, 4, u, v);
        }
        else {
-               BLI_bicubic_interpolation_char((unsigned char*) in->rect, outI, in->x, in->y, 4, u, v);
+               BLI_bicubic_interpolation_char((unsigned char *) in->rect, outI, in->x, in->y, 4, u, v);
        }
 }
 
@@ -130,7 +130,7 @@ void bilinear_interpolation_color(struct ImBuf *in, unsigned char outI[4], float
                BLI_bilinear_interpolation_fl(in->rect_float, outF, in->x, in->y, 4, u, v);
        }
        else {
-               BLI_bilinear_interpolation_char((unsigned char*) in->rect, outI, in->x, in->y, 4, u, v);
+               BLI_bilinear_interpolation_char((unsigned char *) in->rect, outI, in->x, in->y, 4, u, v);
        }
 }
 
index 2785a95ddb009e7e37ad368a5493778c9cdeefbc..6b1f496b5939b5a1f52e3597169bab71d9c6188e 100644 (file)
@@ -415,10 +415,10 @@ static const char *rna_type_type_name(PropertyRNA *prop)
                        return "float";
                case PROP_STRING:
                        if (prop->flag & PROP_THICK_WRAP) {
-                               return "char*";
+                               return "char *";
                        }
                        else {
-                               return "const char*";
+                               return "const char *";
                        }
                default:
                        return NULL;
@@ -870,16 +870,16 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 
                                if (prop->flag & PROP_ID_REFCOUNT) {
                                        fprintf(f, "\n  if (data->%s)\n", dp->dnaname);
-                                       fprintf(f, "            id_us_min((ID*)data->%s);\n", dp->dnaname);
+                                       fprintf(f, "            id_us_min((ID *)data->%s);\n", dp->dnaname);
                                        fprintf(f, "    if (value.data)\n");
-                                       fprintf(f, "            id_us_plus((ID*)value.data);\n\n");
+                                       fprintf(f, "            id_us_plus((ID *)value.data);\n\n");
                                }
                                else {
                                        PointerPropertyRNA *pprop = (PointerPropertyRNA *)dp->prop;
                                        StructRNA *type = rna_find_struct((const char *)pprop->type);
                                        if (type && (type->flag & STRUCT_ID)) {
                                                fprintf(f, "    if (value.data)\n");
-                                               fprintf(f, "            id_lib_extern((ID*)value.data);\n\n");
+                                               fprintf(f, "            id_lib_extern((ID *)value.data);\n\n");
                                        }
                                }
 
@@ -1084,7 +1084,7 @@ static char *rna_def_property_begin_func(FILE *f, StructRNA *srna, PropertyRNA *
 
        fprintf(f, "\n  memset(iter, 0, sizeof(*iter));\n");
        fprintf(f, "    iter->parent= *ptr;\n");
-       fprintf(f, "    iter->prop= (PropertyRNA*)&rna_%s_%s;\n", srna->identifier, prop->identifier);
+       fprintf(f, "    iter->prop= (PropertyRNA *)&rna_%s_%s;\n", srna->identifier, prop->identifier);
 
        if (dp->dnalengthname || dp->dnalengthfixed) {
                if (manualfunc) {
@@ -1768,7 +1768,7 @@ static void rna_def_property_funcs_header_cpp(FILE *f, StructRNA *srna, Property
                        const char *collection_funcs = "DefaultCollectionFunctions";
 
                        if (!(dp->prop->flag & (PROP_IDPROPERTY | PROP_BUILTIN)) && cprop->property.srna)
-                               collection_funcs  = (char*)cprop->property.srna;
+                               collection_funcs  = (char *)cprop->property.srna;
 
                        if (cprop->item_type)
                                fprintf(f, "\tCOLLECTION_PROPERTY(%s, %s, %s, %s, %s, %s, %s)", collection_funcs, (const char *)cprop->item_type, srna->identifier,
@@ -2906,9 +2906,9 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
                rna_property_structname(prop->type),
                srna->identifier, strnest, prop->identifier);
 
-       if (prop->next) fprintf(f, "\t{(PropertyRNA*)&rna_%s%s_%s, ", srna->identifier, strnest, prop->next->identifier);
+       if (prop->next) fprintf(f, "\t{(PropertyRNA *)&rna_%s%s_%s, ", srna->identifier, strnest, prop->next->identifier);
        else fprintf(f, "\t{NULL, ");
-       if (prop->prev) fprintf(f, "(PropertyRNA*)&rna_%s%s_%s,\n", srna->identifier, strnest, prop->prev->identifier);
+       if (prop->prev) fprintf(f, "(PropertyRNA *)&rna_%s%s_%s,\n", srna->identifier, strnest, prop->prev->identifier);
        else fprintf(f, "NULL,\n");
        fprintf(f, "\t%d, ", prop->magic);
        rna_print_c_string(f, prop->identifier);
@@ -3080,12 +3080,12 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
                fprintf(f, "%s%s rna_%s_%s_func = {\n", "", "FunctionRNA", srna->identifier, func->identifier);
 
                if (func->cont.next)
-                       fprintf(f, "\t{(FunctionRNA*)&rna_%s_%s_func, ", srna->identifier,
+                       fprintf(f, "\t{(FunctionRNA *)&rna_%s_%s_func, ", srna->identifier,
                                ((FunctionRNA *)func->cont.next)->identifier);
                else
                        fprintf(f, "\t{NULL, ");
                if (func->cont.prev)
-                       fprintf(f, "(FunctionRNA*)&rna_%s_%s_func,\n", srna->identifier,
+                       fprintf(f, "(FunctionRNA *)&rna_%s_%s_func,\n", srna->identifier,
                                ((FunctionRNA *)func->cont.prev)->identifier);
                else
                        fprintf(f, "NULL,\n");
@@ -3093,11 +3093,11 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
                fprintf(f, "\tNULL,\n");
 
                parm = func->cont.properties.first;
-               if (parm) fprintf(f, "\t{(PropertyRNA*)&rna_%s_%s_%s, ", srna->identifier, func->identifier, parm->identifier);
+               if (parm) fprintf(f, "\t{(PropertyRNA *)&rna_%s_%s_%s, ", srna->identifier, func->identifier, parm->identifier);
                else fprintf(f, "\t{NULL, ");
 
                parm = func->cont.properties.last;
-               if (parm) fprintf(f, "(PropertyRNA*)&rna_%s_%s_%s}},\n", srna->identifier, func->identifier, parm->identifier);
+               if (parm) fprintf(f, "(PropertyRNA *)&rna_%s_%s_%s}},\n", srna->identifier, func->identifier, parm->identifier);
                else fprintf(f, "NULL}},\n");
 
                fprintf(f, "\t");
@@ -3110,7 +3110,7 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
                else fprintf(f, "\tNULL,\n");
 
                if (func->c_ret)
-                       fprintf(f, "\t(PropertyRNA*)&rna_%s_%s_%s\n", srna->identifier, func->identifier, func->c_ret->identifier);
+                       fprintf(f, "\t(PropertyRNA *)&rna_%s_%s_%s\n", srna->identifier, func->identifier, func->c_ret->identifier);
                else
                        fprintf(f, "\tNULL\n");
 
@@ -3128,11 +3128,11 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
        fprintf(f, "\tNULL,\n");
 
        prop = srna->cont.properties.first;
-       if (prop) fprintf(f, "\t{(PropertyRNA*)&rna_%s_%s, ", srna->identifier, prop->identifier);
+       if (prop) fprintf(f, "\t{(PropertyRNA *)&rna_%s_%s, ", srna->identifier, prop->identifier);
        else fprintf(f, "\t{NULL, ");
 
        prop = srna->cont.properties.last;
-       if (prop) fprintf(f, "(PropertyRNA*)&rna_%s_%s}},\n", srna->identifier, prop->identifier);
+       if (prop) fprintf(f, "(PropertyRNA *)&rna_%s_%s}},\n", srna->identifier, prop->identifier);
        else fprintf(f, "NULL}},\n");
        fprintf(f, "\t");
        rna_print_c_string(f, srna->identifier);
@@ -3151,7 +3151,7 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
                while (base->base && base->base->nameproperty == prop)
                        base = base->base;
 
-               fprintf(f, "\t(PropertyRNA*)&rna_%s_%s, ", base->identifier, prop->identifier);
+               fprintf(f, "\t(PropertyRNA *)&rna_%s_%s, ", base->identifier, prop->identifier);
        }
        else fprintf(f, "\tNULL, ");
 
@@ -3159,7 +3159,7 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
        base = srna;
        while (base->base && base->base->iteratorproperty == prop)
                base = base->base;
-       fprintf(f, "(PropertyRNA*)&rna_%s_rna_properties,\n", base->identifier);
+       fprintf(f, "(PropertyRNA *)&rna_%s_rna_properties,\n", base->identifier);
 
        if (srna->base) fprintf(f, "\t&RNA_%s,\n", srna->base->identifier);
        else fprintf(f, "\tNULL,\n");
@@ -3181,11 +3181,11 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
        }
 
        func = srna->functions.first;
-       if (func) fprintf(f, "\t{(FunctionRNA*)&rna_%s_%s_func, ", srna->identifier, func->identifier);
+       if (func) fprintf(f, "\t{(FunctionRNA *)&rna_%s_%s_func, ", srna->identifier, func->identifier);
        else fprintf(f, "\t{NULL, ");
 
        func = srna->functions.last;
-       if (func) fprintf(f, "(FunctionRNA*)&rna_%s_%s_func}\n", srna->identifier, func->identifier);
+       if (func) fprintf(f, "(FunctionRNA *)&rna_%s_%s_func}\n", srna->identifier, func->identifier);
        else fprintf(f, "NULL}\n");
 
        fprintf(f, "};\n");
@@ -3575,7 +3575,7 @@ static const char *cpp_classes = ""
 "      int length;\n"
 "\n"
 "      DynamicArray() : data(NULL), length(0) {}\n"
-"      DynamicArray(int new_length) : data(NULL), length(new_length) { data = (float*)malloc(sizeof(T) * new_length); }\n"
+"      DynamicArray(int new_length) : data(NULL), length(new_length) { data = (float *)malloc(sizeof(T) * new_length); }\n"
 "      DynamicArray(const DynamicArray<T>& other) { copy_from(other); }\n"
 "      const DynamicArray<T>& operator=(const DynamicArray<T>& other) { copy_from(other); return *this; }\n"
 "\n"
@@ -3586,7 +3586,7 @@ static const char *cpp_classes = ""
 "protected:\n"
 "      void copy_from(const DynamicArray<T>& other) {\n"
 "              if (data) free(data);\n"
-"              data = (float*)malloc(sizeof(T) * other.length);\n"
+"              data = (float *)malloc(sizeof(T) * other.length);\n"
 "              memcpy(data, other.data, sizeof(T) * other.length);\n"
 "              length = other.length;\n"
 "      }\n"
@@ -3617,7 +3617,7 @@ static const char *cpp_classes = ""
 "{ return iter.valid != other.iter.valid; }\n"
 "\n"
 "      void begin(const Pointer &ptr)\n"
-"      { if (init) Tend(&iter); Tbegin(&iter, (PointerRNA*)&ptr.ptr); t = T(iter.ptr); init = true; }\n"
+"      { if (init) Tend(&iter); Tbegin(&iter, (PointerRNA *)&ptr.ptr); t = T(iter.ptr); init = true; }\n"
 "\n"
 "private:\n"
 "      const CollectionIterator<T, Tbegin, Tnext, Tend>& operator="
@@ -3751,13 +3751,13 @@ static void rna_generate_header_cpp(BlenderRNA *UNUSED(brna), FILE *f)
                                        if (first_collection_func_struct == NULL)
                                                first_collection_func_struct = ds->srna->identifier;
 
-                                       if (!rna_is_collection_functions_struct(collection_func_structs, (char*)prop->srna)) {
+                                       if (!rna_is_collection_functions_struct(collection_func_structs, (char *)prop->srna)) {
                                                if (all_collection_func_structs >= max_collection_func_structs) {
                                                        printf("Array size to store all collection structures names is too small\n");
                                                        exit(1);
                                                }
 
-                                               collection_func_structs[all_collection_func_structs++] = (char*)prop->srna;
+                                               collection_func_structs[all_collection_func_structs++] = (char *)prop->srna;
                                        }
                                }
                        }
index e1489d821a09df408d581ffe829a8e4ff454dbef..dda9a2b0494ad9373a855ef9bd1aab0868f17e67 100644 (file)
@@ -748,13 +748,13 @@ static void rna_BevelModifier_angle_limit_set(PointerRNA *ptr, float value)
 
 static void rna_UVWarpModifier_vgroup_set(PointerRNA *ptr, const char *value)
 {
-       UVWarpModifierData *umd = (UVWarpModifierData*)ptr->data;
+       UVWarpModifierData *umd = (UVWarpModifierData *)ptr->data;
        rna_object_vgroup_name_set(ptr, value, umd->vgroup_name, sizeof(umd->vgroup_name));
 }
 
 static void rna_UVWarpModifier_uvlayer_set(PointerRNA *ptr, const char *value)
 {
-       UVWarpModifierData *umd = (UVWarpModifierData*)ptr->data;
+       UVWarpModifierData *umd = (UVWarpModifierData *)ptr->data;
        rna_object_uvlayer_name_set(ptr, value, umd->uvlayer_name, sizeof(umd->uvlayer_name));
 }
 
index 3e9f5f1b88f2cd376b3ac9becc739bbfb5a7e716..05dba0c0f68a39ac2fa6058fa6404b124c8edaa8 100644 (file)
@@ -1101,7 +1101,7 @@ static void rna_ShaderNodeScript_mode_set(PointerRNA *ptr, int value)
 
                /* replace text datablock by filepath */
                if (node->id) {
-                       Text *text = (Text*)node->id;
+                       Text *text = (Text *)node->id;
 
                        if (value == NODE_SCRIPT_EXTERNAL && text->name) {
                                BLI_strncpy(nss->filepath, text->name, sizeof(nss->filepath));
index 8a67d9270e84b5b629e57ac92d9023b3f360e353..4918aabdb1f966a60061171c10f32a9117134344 100644 (file)
@@ -1123,7 +1123,7 @@ static void rna_GameObjectSettings_used_state_get(PointerRNA *ptr, int *values)
 
 static void rna_GameObjectSettings_col_group_get(PointerRNA *ptr, int *values)
 {
-       Object *ob = (Object*)ptr->data;
+       Object *ob = (Object *)ptr->data;
        int i;
 
        for (i = 0; i < OB_MAX_COL_MASKS; i++) {
@@ -1133,7 +1133,7 @@ static void rna_GameObjectSettings_col_group_get(PointerRNA *ptr, int *values)
 
 static void rna_GameObjectSettings_col_group_set(PointerRNA *ptr, const int *values)
 {
-       Object *ob = (Object*)ptr->data;
+       Object *ob = (Object *)ptr->data;
        int i, tot = 0;
 
        /* ensure we always have some group selected */
@@ -1152,7 +1152,7 @@ static void rna_GameObjectSettings_col_group_set(PointerRNA *ptr, const int *val
 
 static void rna_GameObjectSettings_col_mask_get(PointerRNA *ptr, int *values)
 {
-       Object *ob = (Object*)ptr->data;
+       Object *ob = (Object *)ptr->data;
        int i;
 
        for (i = 0; i < OB_MAX_COL_MASKS; i++) {
@@ -1162,7 +1162,7 @@ static void rna_GameObjectSettings_col_mask_get(PointerRNA *ptr, int *values)
 
 static void rna_GameObjectSettings_col_mask_set(PointerRNA *ptr, const int *values)
 {
-       Object *ob = (Object*)ptr->data;
+       Object *ob = (Object *)ptr->data;
        int i, tot = 0;
 
        /* ensure we always have some mask selected */
index a15bbb7e9880b695fb5e8f0ca48ec530fe5c10d1..75164a3823920e27a491d24d83fd9f4d37dce182 100644 (file)
@@ -1131,7 +1131,7 @@ static void rna_SceneRenderLayer_name_set(PointerRNA *ptr, const char *value)
 
 static char *rna_SceneRenderLayer_path(PointerRNA *ptr)
 {
-       SceneRenderLayer *srl = (SceneRenderLayer*)ptr->data;
+       SceneRenderLayer *srl = (SceneRenderLayer *)ptr->data;
        return BLI_sprintfN("render.layers[\"%s\"]", srl->name);
 }
 
index 86ef8a14c129576a1fe8852c206e0d988734a775..dc8d427c0ae84151344b52ee56cbc23ad74e06c0 100644 (file)
@@ -305,7 +305,7 @@ void node_group_verify(struct bNodeTree *ntree, struct bNode *node, struct ID *i
 {
        /* check inputs and outputs, and remove or insert them */
        if (node->id==id) {
-               bNodeTree *ngroup= (bNodeTree*)node->id;
+               bNodeTree *ngroup= (bNodeTree *)node->id;
                group_verify_socket_list(ntree, node, &node->inputs, SOCK_IN, &ngroup->inputs);
                group_verify_socket_list(ntree, node, &node->outputs, SOCK_OUT, &ngroup->outputs);
        }
@@ -314,7 +314,7 @@ void node_group_verify(struct bNodeTree *ntree, struct bNode *node, struct ID *i
 struct bNodeTree *node_group_edit_get(bNode *node)
 {
        if (node->flag & NODE_GROUP_EDIT)
-               return (bNodeTree*)node->id;
+               return (bNodeTree *)node->id;
        else
                return NULL;
 }
@@ -322,7 +322,7 @@ struct bNodeTree *node_group_edit_get(bNode *node)
 struct bNodeTree *node_group_edit_set(bNode *node, int edit)
 {
        if (edit) {
-               bNodeTree *ngroup= (bNodeTree*)node->id;
+               bNodeTree *ngroup= (bNodeTree *)node->id;
                if (ngroup) {
                        if (ngroup->id.lib)
                                ntreeMakeLocal(ngroup);
@@ -339,7 +339,7 @@ struct bNodeTree *node_group_edit_set(bNode *node, int edit)
 
 void node_group_edit_clear(bNode *node)
 {
-       bNodeTree *ngroup= (bNodeTree*)node->id;
+       bNodeTree *ngroup= (bNodeTree *)node->id;
        bNode *inode;
        
        node->flag &= ~NODE_GROUP_EDIT;
index 3cc7ebf933799ec3eb7bf58f11e0275aa58b27f2..86f8f4dfbbf8eeab8ea22e54e61bedc27ce3a3fd 100644 (file)
@@ -114,13 +114,13 @@ static struct bNodeStack *setup_stack(bNodeStack *stack, bNodeSocket *sock)
        if (sock->default_value) {
                switch (sock->type) {
                case SOCK_FLOAT:
-                       ns->vec[0] = ((bNodeSocketValueFloat*)sock->default_value)->value;
+                       ns->vec[0] = ((bNodeSocketValueFloat *)sock->default_value)->value;
                        break;
                case SOCK_VECTOR:
-                       copy_v3_v3(ns->vec, ((bNodeSocketValueVector*)sock->default_value)->value);
+                       copy_v3_v3(ns->vec, ((bNodeSocketValueVector *)sock->default_value)->value);
                        break;
                case SOCK_RGBA:
-                       copy_v4_v4(ns->vec, ((bNodeSocketValueRGBA*)sock->default_value)->value);
+                       copy_v4_v4(ns->vec, ((bNodeSocketValueRGBA *)sock->default_value)->value);
                        break;
                }
        }
index 6130fe72af3dd3b45045a4cd684b0b07796f467f..544ccb8fda6cd4edf1d02d3327405c426470e736 100644 (file)
@@ -139,49 +139,49 @@ void nodeShaderSynchronizeID(bNode *node, int copyto)
                                if (copyto) {
                                        switch (a) {
                                                case MAT_IN_COLOR:
-                                                       copy_v3_v3(&ma->r, ((bNodeSocketValueRGBA*)sock->default_value)->value); break;
+                                                       copy_v3_v3(&ma->r, ((bNodeSocketValueRGBA *)sock->default_value)->value); break;
                                                case MAT_IN_SPEC:
-                                                       copy_v3_v3(&ma->specr, ((bNodeSocketValueRGBA*)sock->default_value)->value); break;
+                                                       copy_v3_v3(&ma->specr, ((bNodeSocketValueRGBA *)sock->default_value)->value); break;
                                                case MAT_IN_REFL:
-                                                       ma->ref= ((bNodeSocketValueFloat*)sock->default_value)->value; break;
+                                                       ma->ref= ((bNodeSocketValueFloat *)sock->default_value)->value; break;
                                                case MAT_IN_MIR:
-                                                       copy_v3_v3(&ma->mirr, ((bNodeSocketValueRGBA*)sock->default_value)->value); break;
+                                                       copy_v3_v3(&ma->mirr, ((bNodeSocketValueRGBA *)sock->default_value)->value); break;
                                                case MAT_IN_AMB:
-                                                       ma->amb= ((bNodeSocketValueFloat*)sock->default_value)->value; break;
+                                                       ma->amb = ((bNodeSocketValueFloat *)sock->default_value)->value; break;
                                                case MAT_IN_EMIT:
-                                                       ma->emit= ((bNodeSocketValueFloat*)sock->default_value)->value; break;
+                                                       ma->emit = ((bNodeSocketValueFloat *)sock->default_value)->value; break;
                                                case MAT_IN_SPECTRA:
-                                                       ma->spectra= ((bNodeSocketValueFloat*)sock->default_value)->value; break;
+                                                       ma->spectra = ((bNodeSocketValueFloat *)sock->default_value)->value; break;
                                                case MAT_IN_RAY_MIRROR:
-                                                       ma->ray_mirror= ((bNodeSocketValueFloat*)sock->default_value)->value; break;
+                                                       ma->ray_mirror = ((bNodeSocketValueFloat *)sock->default_value)->value; break;
                                                case MAT_IN_ALPHA:
-                                                       ma->alpha= ((bNodeSocketValueFloat*)sock->default_value)->value; break;
+                                                       ma->alpha = ((bNodeSocketValueFloat *)sock->default_value)->value; break;
                                                case MAT_IN_TRANSLUCENCY:
-                                                       ma->translucency= ((bNodeSocketValueFloat*)sock->default_value)->value; break;
+                                                       ma->translucency = ((bNodeSocketValueFloat *)sock->default_value)->value; break;
                                        }
                                }
                                else {
                                        switch (a) {
                                                case MAT_IN_COLOR:
-                                                       copy_v3_v3(((bNodeSocketValueRGBA*)sock->default_value)->value, &ma->r); break;
+                                                       copy_v3_v3(((bNodeSocketValueRGBA *)sock->default_value)->value, &ma->r); break;
                                                case MAT_IN_SPEC:
-                                                       copy_v3_v3(((bNodeSocketValueRGBA*)sock->default_value)->value, &ma->specr); break;
+                                                       copy_v3_v3(((bNodeSocketValueRGBA *)sock->default_value)->value, &ma->specr); break;
                                                case MAT_IN_REFL:
-                                                       ((bNodeSocketValueFloat*)sock->default_value)->value= ma->ref; break;
+                                                       ((bNodeSocketValueFloat *)sock->default_value)->value= ma->ref; break;
                                                case MAT_IN_MIR:
-                                                       copy_v3_v3(((bNodeSocketValueRGBA*)sock->default_value)->value, &ma->mirr); break;
+                                                       copy_v3_v3(((bNodeSocketValueRGBA *)sock->default_value)->value, &ma->mirr); break;
                                                case MAT_IN_AMB:
-                                                       ((bNodeSocketValueFloat*)sock->default_value)->value= ma->amb; break;
+                                                       ((bNodeSocketValueFloat *)sock->default_value)->value = ma->amb; break;
                                                case MAT_IN_EMIT:
-                                                       ((bNodeSocketValueFloat*)sock->default_value)->value= ma->emit; break;
+                                                       ((bNodeSocketValueFloat *)sock->default_value)->value = ma->emit; break;
                                                case MAT_IN_SPECTRA:
-                                                       ((bNodeSocketValueFloat*)sock->default_value)->value= ma->spectra; break;
+                                                       ((bNodeSocketValueFloat *)sock->default_value)->value = ma->spectra; break;
                                                case MAT_IN_RAY_MIRROR:
-                                                       ((bNodeSocketValueFloat*)sock->default_value)->value= ma->ray_mirror; break;
+                                                       ((bNodeSocketValueFloat *)sock->default_value)->value = ma->ray_mirror; break;
                                                case MAT_IN_ALPHA:
-                                                       ((bNodeSocketValueFloat*)sock->default_value)->value= ma->alpha; break;
+                                                       ((bNodeSocketValueFloat *)sock->default_value)->value = ma->alpha; break;
                                                case MAT_IN_TRANSLUCENCY:
-                                                       ((bNodeSocketValueFloat*)sock->default_value)->value= ma->translucency; break;
+                                                       ((bNodeSocketValueFloat *)sock->default_value)->value = ma->translucency; break;
                                        }
                                }
                        }
@@ -259,7 +259,7 @@ bNode *nodeGetActiveTexture(bNodeTree *ntree)
                        break;
 
        if (node)
-               ntree= (bNodeTree*)node->id;
+               ntree = (bNodeTree *)node->id;
 
        for (node= ntree->nodes.first; node; node= node->next)
                if (node->flag & NODE_ACTIVE_TEXTURE)
@@ -320,7 +320,7 @@ void node_shader_gpu_tex_mapping(GPUMaterial *mat, bNode *node, GPUNodeStack *in
        float domax= (texmap->flag & TEXMAP_CLIP_MAX) != 0;
 
        if (domin || domax || !(texmap->flag & TEXMAP_UNIT_MATRIX)) {
-               GPUNodeLink *tmat = GPU_uniform((float*)texmap->mat);
+               GPUNodeLink *tmat = GPU_uniform((float *)texmap->mat);
                GPUNodeLink *tmin = GPU_uniform(texmap->min);
                GPUNodeLink *tmax = GPU_uniform(texmap->max);
                GPUNodeLink *tdomin = GPU_uniform(&domin);
index 688d77d83505822e848532e58b62718d95ef682c..cf6f778bbf538ef948cf32fcfbe6971cdab1eed7 100644 (file)
@@ -70,7 +70,7 @@ static void move_stack(bNodeStack *to, bNodeStack *from)
 
 static void *group_initexec(bNode *node)
 {
-       bNodeTree *ngroup= (bNodeTree*)node->id;
+       bNodeTree *ngroup = (bNodeTree *)node->id;
        bNodeTreeExec *exec;
        
        if (!ngroup)
@@ -84,7 +84,7 @@ static void *group_initexec(bNode *node)
 
 static void group_freeexec(bNode *UNUSED(node), void *nodedata)
 {
-       bNodeTreeExec*gexec= (bNodeTreeExec*)nodedata;
+       bNodeTreeExec*gexec = (bNodeTreeExec *)nodedata;
        
        ntreeShaderEndExecTree(gexec, 0);
 }
@@ -121,7 +121,7 @@ static void group_move_outputs(bNode *node, bNodeStack **out, bNodeStack *gstack
 
 static void group_execute(void *data, int thread, struct bNode *node, void *nodedata, struct bNodeStack **in, struct bNodeStack **out)
 {
-       bNodeTreeExec *exec= (bNodeTreeExec*)nodedata;
+       bNodeTreeExec *exec = (bNodeTreeExec *)nodedata;
        bNodeThreadStack *nts;
        
        if (!exec)
@@ -177,7 +177,7 @@ static void group_gpu_move_outputs(bNode *node, GPUNodeStack *out, bNodeStack *g
 
 static int gpu_group_execute(GPUMaterial *mat, bNode *node, void *nodedata, GPUNodeStack *in, GPUNodeStack *out)
 {
-       bNodeTreeExec *exec= (bNodeTreeExec*)nodedata;
+       bNodeTreeExec *exec = (bNodeTreeExec *)nodedata;
        
        group_gpu_copy_inputs(node, in, exec->stack);
        ntreeExecGPUNodes(exec, mat, (node->flag & NODE_GROUP_EDIT));
index cedd3a4910cf19786f4eb0b6d92e401369663931..396c1ac60bf3a46fd0a354568be81c6592bbeba4 100644 (file)
@@ -77,7 +77,7 @@ static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, GPUNodeStack *in, G
        TexMapping *texmap= node->storage;
        float domin= (texmap->flag & TEXMAP_CLIP_MIN) != 0;
        float domax= (texmap->flag & TEXMAP_CLIP_MAX) != 0;
-       GPUNodeLink *tmat = GPU_uniform((float*)texmap->mat);
+       GPUNodeLink *tmat = GPU_uniform((float *)texmap->mat);
        GPUNodeLink *tmin = GPU_uniform(texmap->min);
        GPUNodeLink *tmax = GPU_uniform(texmap->max);
        GPUNodeLink *tdomin = GPU_uniform(&domin);
index 935a5f9030be36d8f7243fdaf182d3f72596ddab..45c9247d7109557843461e545e809c06c51651c2 100644 (file)
@@ -53,7 +53,7 @@ void PyC_MainModule_Restore(PyObject *main_mod);
 
 void PyC_SetHomePath(const char *py_path_bundle);
 
-#define PYC_INTERPRETER_ACTIVE (((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL)
+#define PYC_INTERPRETER_ACTIVE (((PyThreadState *)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL)
 
 void *PyC_RNA_AsPointer(PyObject *value, const char *type_name);
 
index f9ed012b117bbf90c38655c951ad8b42f53dd4fa..01e592cba0c9022f9a2d627b160f98d8b073e3b0 100644 (file)
@@ -173,13 +173,13 @@ static int  RE_rayobject_instance_intersect(RayObject *o, Isect *isec)
 
 static void RE_rayobject_instance_free(RayObject *o)
 {
-       InstanceRayObject *obj = (InstanceRayObject*)o;
+       InstanceRayObject *obj = (InstanceRayObject *)o;
        MEM_freeN(obj);
 }
 
 static float RE_rayobject_instance_cost(RayObject *o)
 {
-       InstanceRayObject *obj = (InstanceRayObject*)o;
+       InstanceRayObject *obj = (InstanceRayObject *)o;
        return RE_rayobject_cost(obj->target) + RE_COST_INSTANCE;
 }
 
index fc1a9b2f755f32fc7ca15852acfc4058c82888d8..76d67765424b38070f4483dc66f80fd358d0d7cd 100644 (file)
@@ -161,7 +161,7 @@ static HaloRen *initstar(Render *re, ObjectRen *obr, const float vec[3], float h
  */
 
 void RE_make_stars(Render *re, Scene *scenev3d, void (*initfunc)(void),
-                   void (*vertexfunc)(float*),  void (*termfunc)(void))
+                   void (*vertexfunc)(float *),  void (*termfunc)(void))
 {
        extern unsigned char hash[512];
        ObjectRen *obr= NULL;
index fb9eb59cbbfb23fa990c5099ec789bbe83858ac7..bef5902588c3e8dab2d5c29438079779957cf75e 100644 (file)
@@ -81,7 +81,7 @@ extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 static int test_break(void *data)
 {
-       Render *re = (Render*)data;
+       Render *re = (Render *)data;
        return re->test_break(re->tbh);
 }
 
@@ -250,9 +250,9 @@ RayObject* makeraytree_object(Render *re, ObjectInstanceRen *obi)
                //Create Ray cast accelaration structure
                raytree = rayobject_create( re,  re->r.raytrace_structure, faces );
                if (  (re->r.raytrace_options & R_RAYTRACE_USE_LOCAL_COORDS) )
-                       vlakprimitive = obr->rayprimitives = (VlakPrimitive*)MEM_callocN(faces*sizeof(VlakPrimitive), "ObjectRen primitives");
+                       vlakprimitive = obr->rayprimitives = (VlakPrimitive *)MEM_callocN(faces * sizeof(VlakPrimitive), "ObjectRen primitives");
                else
-                       face = obr->rayfaces = (RayFace*)MEM_callocN(faces*sizeof(RayFace), "ObjectRen faces");
+                       face = obr->rayfaces = (RayFace *)MEM_callocN(faces * sizeof(RayFace), "ObjectRen faces");
 
                obr->rayobi = obi;
                
@@ -345,10 +345,10 @@ static void makeraytree_single(Render *re)
        raytree = re->raytree = rayobject_create( re, re->r.raytrace_structure, faces+special );
 
        if ( (re->r.raytrace_options & R_RAYTRACE_USE_LOCAL_COORDS) ) {
-               vlakprimitive = re->rayprimitives = (VlakPrimitive*)MEM_callocN(faces*sizeof(VlakPrimitive), "Raytrace vlak-primitives");
+               vlakprimitive = re->rayprimitives = (VlakPrimitive *)MEM_callocN(faces * sizeof(VlakPrimitive), "Raytrace vlak-primitives");
        }
        else {
-               face = re->rayfaces     = (RayFace*)MEM_callocN(faces*sizeof(RayFace), "Render ray faces");
+               face = re->rayfaces     = (RayFace *)MEM_callocN(faces * sizeof(RayFace), "Render ray faces");
        }
        
        for (obi=re->instancetable.first; obi; obi=obi->next)
@@ -496,8 +496,8 @@ static void shade_ray_set_derivative(ShadeInput *shi)
 
 void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr)
 {
-       ObjectInstanceRen *obi= (ObjectInstanceRen*)is->hit.ob;
-       VlakRen *vlr= (VlakRen*)is->hit.face;
+       ObjectInstanceRen *obi = (ObjectInstanceRen *)is->hit.ob;
+       VlakRen *vlr = (VlakRen *)is->hit.face;
        
        /* set up view vector */
        copy_v3_v3(shi->view, is->dir);
index bd0061c0e68281488e9c242dac74ede15a4bf0d0..9f171ba71dbe6cd946f3814904b533d1b709fb6c 100644 (file)
@@ -1172,7 +1172,7 @@ typedef struct ZbufSolidData {
 
 static void make_pixelstructs(RenderPart *pa, ZSpan *zspan, int sample, void *data)
 {
-       ZbufSolidData *sdata= (ZbufSolidData*)data;
+       ZbufSolidData *sdata = (ZbufSolidData *)data;
        ListBase *lb= sdata->psmlist;
        intptr_t *rd= pa->rectdaps;
        int *ro= zspan->recto;
@@ -1740,7 +1740,7 @@ void zbufshade_sss_tile(RenderPart *pa)
 #if 0
                        if (rs) {
                                /* for each sample in this pixel, shade it */
-                               for (ps=(PixStr*)*rs; ps; ps=ps->next) {
+                               for (ps = (PixStr *)(*rs); ps; ps=ps->next) {
                                        ObjectInstanceRen *obi= &re->objectinstance[ps->obi];
                                        ObjectRen *obr= obi->obr;
                                        vlr= RE_findOrAddVlak(obr, (ps->facenr-1) & RE_QUAD_MASK);
@@ -2461,8 +2461,8 @@ static void do_bake_shade(void *handle, int x, int y, float u, float v)
 
                /* if hit, we shade from the new point, otherwise from point one starting face */
                if (hit) {
-                       obi= (ObjectInstanceRen*)minisec.hit.ob;
-                       vlr= (VlakRen*)minisec.hit.face;
+                       obi = (ObjectInstanceRen *)minisec.hit.ob;
+                       vlr = (VlakRen *)minisec.hit.face;
                        quad= (minisec.isect == 2);
                        copy_v3_v3(shi->co, minco);
                        
index e189d8bdaea3b2e3308cae5c9a52230c140d688f..a4e5b9eb7a2644c23b7888fbf806264e1485bfb4 100644 (file)
@@ -370,7 +370,7 @@ RadFace **RE_vlakren_get_radface(ObjectRen *obr, VlakRen *vlak, int verify)
        radface= obr->vlaknodes[nr].radface;
        if (radface==NULL) {
                if (verify) 
-                       radface= obr->vlaknodes[nr].radface= MEM_callocN(256*RE_RADFACE_ELEMS*sizeof(void*), "radface table");
+                       radface = obr->vlaknodes[nr].radface= MEM_callocN(256 * RE_RADFACE_ELEMS * sizeof(void *), "radface table");
                else
                        return NULL;
        }
@@ -888,9 +888,9 @@ HaloRen *RE_findOrAddHalo(ObjectRen *obr, int nr)
                //      TABLEINITSIZE, obr->blohalen+TABLEINITSIZE );
                temp=obr->bloha;
                
-               obr->bloha=(HaloRen**)MEM_callocN(sizeof(void*)*(obr->blohalen+TABLEINITSIZE), "Bloha");
-               if (temp) memcpy(obr->bloha, temp, obr->blohalen*sizeof(void*));
-               memset(&(obr->bloha[obr->blohalen]), 0, TABLEINITSIZE*sizeof(void*));
+               obr->bloha = (HaloRen**)MEM_callocN(sizeof(void *) * (obr->blohalen + TABLEINITSIZE), "Bloha");
+               if (temp) memcpy(obr->bloha, temp, obr->blohalen*sizeof(void *));
+               memset(&(obr->bloha[obr->blohalen]), 0, TABLEINITSIZE * sizeof(void *));
                obr->blohalen+=TABLEINITSIZE;  /*Does this really need to be power of 2?*/
                if (temp) MEM_freeN(temp);
        }
index 078c11a20613a6e4b0aca9cc804ddbe0862bae89..87912f546e839097fc68c53d218fafa53ab56f32 100644 (file)
@@ -812,7 +812,7 @@ void makeshadowbuf(Render *re, LampRen *lar)
 
 static void *do_shadow_thread(void *re_v)
 {
-       Render *re= (Render*)re_v;
+       Render *re = (Render *)re_v;
        LampRen *lar;
 
        do {
index 569bac29205d6beb89e618a61fca3c1345f4f609..a37ffb1eb2870a8d350ca779fe8623bf3b753d85 100644 (file)
@@ -522,7 +522,7 @@ static APixstrand *addpsAstrand(ZSpan *zspan)
 
 static void do_strand_fillac(void *handle, int x, int y, float u, float v, float z)
 {
-       StrandPart *spart= (StrandPart*)handle;
+       StrandPart *spart= (StrandPart *)handle;
        StrandShadeCache *cache= spart->cache;
        StrandSegment *sseg= spart->segment;
        APixstrand *apn, *apnew;
index 549148f4e29f3869163810e95ddc7305a7ca923c..a9db197ed48d69f1357ef9878d446e307d2f3de4 100644 (file)
@@ -493,7 +493,7 @@ typedef struct VolPrecacheQueue {
  */
 static void *vol_precache_part(void *data)
 {
-       VolPrecacheQueue *queue = (VolPrecacheQueue*)data;
+       VolPrecacheQueue *queue = (VolPrecacheQueue *)data;
        VolPrecachePart *pa;
 
        while ((pa = BLI_thread_queue_pop(queue->work))) {
index 576c0f341b1dfb45482f1654c29d70188ad1e779..ce0576c68d1611d2e899d6802d75700b5994e8f4 100644 (file)
@@ -200,7 +200,7 @@ void WM_operator_stack_clear(struct bContext *C) {}
 void WM_autosave_init(struct bContext *C) {}
 void WM_jobs_kill_all_except(struct wmWindowManager *wm) {}
 
-char *WM_clipboard_text_get(int selection) {return (char*)0;}
+char *WM_clipboard_text_get(int selection) {return (char *)0;}
 void WM_clipboard_text_set(char *buf, int selection) {}
 
 void                WM_uilisttype_init(void) {}